IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Overriding text with admin_js.* keys didn't work (#18281)

Browse Source
This commit is contained in:
Gerhard Schlager 2022-09-20 02:47:57 +02:00 committed by GitHub
parent f91426a7fa
commit 7b243f3955
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/initializers/localization.js
View File

@ -26,7 +26,7 @@ export default {
// Merge any overrides into our object
for (const [locale, overrides] of Object.entries(I18n._overrides || {})) {
for (const [key, value] of Object.entries(overrides)) {
const segs = key.replace(/^admin_js\./, "js.admin.").split(".");
const segs = key.replace(/^admin_js\./, "js.").split(".");
let node = I18n.translations[locale] || {};
for (let i = 0; i < segs.length - 1; i++) {

19
app/assets/javascripts/discourse/tests/unit/localization-test.js
View File

@ -112,12 +112,17 @@ test("translation overrides", function (assert) {
test("translation overrides (admin_js)", function (assert) {
I18n._overrides = {
fr: {
"admin_js.api.both_languages1": "admin.api.both_languages1 (FR override)",
"admin_js.api.only_english2": "admin.api.only_english2 (FR override)",
"admin_js.admin.api.both_languages1":
"admin.api.both_languages1 (FR override)",
"admin_js.admin.api.only_english2":
"admin.api.only_english2 (FR override)",
"admin_js.type_to_filter": "type_to_filter (FR override)",
},
en: {
"admin_js.api.both_languages2": "admin.api.both_languages2 (EN override)",
"admin_js.api.only_english1": "admin.api.only_english1 (EN override)",
"admin_js.admin.api.both_languages2":
"admin.api.both_languages2 (EN override)",
"admin_js.admin.api.only_english1":
"admin.api.only_english1 (EN override)",
},
};
LocalizationInitializer.initialize(getApplication());
@ -145,6 +150,12 @@ test("translation overrides (admin_js)", function (assert) {
"admin.api.both_languages2 (FR)",
"prefers translation in current locale over override in fallback locale"
);
assert.strictEqual(
I18n.t("type_to_filter"),
"type_to_filter (FR override)",
"correctly changes the translation key by removing `admin_js`"
);
});
test("translation overrides for MessageFormat strings", function (assert) {