mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-04-24 04:40:43 +03:00
feat(ui): make JS asset load error message translatable (#7388)
- The 'Failed to load asset files from [...]' is now an translatable string. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7388 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org>
This commit is contained in:
parent
c497ef9e81
commit
6ad625b0c1
4 changed files with 45 additions and 18 deletions
options/locale_next
templates/base
tests/integration
|
@ -17,5 +17,6 @@
|
|||
"themes.names.forgejo-auto": "Forgejo (follow system theme)",
|
||||
"themes.names.forgejo-light": "Forgejo light",
|
||||
"themes.names.forgejo-dark": "Forgejo dark",
|
||||
"error.not_found.title": "Page not found"
|
||||
"error.not_found.title": "Page not found",
|
||||
"alert.asset_load_failed": "Failed to load asset files from {path}. Please make sure the asset files can be accessed."
|
||||
}
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
{{template "base/footer_content" .}}
|
||||
|
||||
<script src="{{AssetUrlPrefix}}/js/index.js?v={{AssetVersion}}" onerror="alert('Failed to load asset files from ' + this.src + '. Please make sure the asset files can be accessed.')"></script>
|
||||
<script src="{{AssetUrlPrefix}}/js/index.js?v={{AssetVersion}}" onerror="alert('{{ctx.Locale.Tr "alert.asset_load_failed"}}'.replace('{path}', this.src))"></script>
|
||||
|
||||
{{template "custom/footer" .}}
|
||||
</body>
|
||||
|
|
41
tests/integration/common_navigation_test.go
Normal file
41
tests/integration/common_navigation_test.go
Normal file
|
@ -0,0 +1,41 @@
|
|||
// Copyright 2024-2025 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"forgejo.org/models/unittest"
|
||||
"forgejo.org/modules/translation"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
// This test verifies common elements that are visible on all pages but most
|
||||
// likely to be first seen on `/`
|
||||
func TestCommonNavigationElements(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
session := loginUser(t, "user1")
|
||||
locale := translation.NewLocale("en-US")
|
||||
|
||||
response := session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
|
||||
page := NewHTMLParser(t, response.Body)
|
||||
|
||||
// Navbar
|
||||
links := page.Find("#navbar .dropdown[data-tooltip-content='Create…'] .menu")
|
||||
assert.Equal(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href='/repo/create']").Text()))
|
||||
assert.Equal(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href='/repo/migrate']").Text()))
|
||||
assert.Equal(t, locale.TrString("new_org.link"), strings.TrimSpace(links.Find("a[href='/org/create']").Text()))
|
||||
|
||||
// After footer: index.js
|
||||
page.AssertElement(t, "script[src^='/assets/js/index.js']", true)
|
||||
onerror, _ := page.Find("script[src^='/assets/js/index.js']").Attr("onerror")
|
||||
expected := fmt.Sprintf("alert('%s'.replace('{path}', this.src))", locale.TrString("alert.asset_load_failed"))
|
||||
assert.Equal(t, expected, onerror)
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
||||
// Copyright 2024-2025 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
package integration
|
||||
|
@ -14,7 +14,6 @@ import (
|
|||
unit_model "forgejo.org/models/unit"
|
||||
"forgejo.org/models/unittest"
|
||||
user_model "forgejo.org/models/user"
|
||||
"forgejo.org/modules/translation"
|
||||
issue_service "forgejo.org/services/issue"
|
||||
files_service "forgejo.org/services/repository/files"
|
||||
"forgejo.org/tests"
|
||||
|
@ -24,20 +23,6 @@ import (
|
|||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestUserDashboardActionLinks(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
session := loginUser(t, "user1")
|
||||
locale := translation.NewLocale("en-US")
|
||||
|
||||
response := session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
|
||||
page := NewHTMLParser(t, response.Body)
|
||||
links := page.Find("#navbar .dropdown[data-tooltip-content='Create…'] .menu")
|
||||
assert.Equal(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href='/repo/create']").Text()))
|
||||
assert.Equal(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href='/repo/migrate']").Text()))
|
||||
assert.Equal(t, locale.TrString("new_org.link"), strings.TrimSpace(links.Find("a[href='/org/create']").Text()))
|
||||
}
|
||||
|
||||
func TestUserDashboardFeedWelcome(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
|
|
Loading…
Reference in a new issue