milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor translation method

Browse source
This commit is contained in:
Bill Thornton 2021-09-08 13:11:20 -04:00
parent 1c663b7675
commit 172e06ed3f
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/scripts/globalize.js
View file

@ -187,18 +187,22 @@ import * as userSettings from './settings/userSettings';
function translateKeyFromModule(key, module) {
let dictionary = getDictionary(module, getCurrentLocale());
if (!dictionary || !dictionary[key]) {
dictionary = getDictionary(module, fallbackCulture);
if (dictionary && dictionary[key]) {
return dictionary[key];
}
if (!dictionary || !dictionary[key]) {
if (dictionary && isEmpty(dictionary)) {
console.warn('Translation dictionary is empty.');
} else {
console.error(`Translation key is missing from dictionary: ${key}`);
}
return key;
dictionary = getDictionary(module, fallbackCulture);
if (dictionary && dictionary[key]) {
return dictionary[key];
}
return dictionary[key];
if (!dictionary || isEmpty(dictionary)) {
console.warn('Translation dictionary is empty.');
} else {
console.error(`Translation key is missing from dictionary: ${key}`);
}
return key;
}
function replaceAll(str, find, replace) {