frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1918 from node-red-hitachi/fix-i18n-for-safari

Browse Source 
Fix i18n handling for ja-JP locale on Safari/MacOS
This commit is contained in:
Nick O'Leary
2018-10-11 14:21:20 -07:00
committed by GitHub
parent 6bd0682e8c 14435c24ac
commit a20eaf852f
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/node_modules/@node-red/editor-api/lib/editor/locales.js vendored
View File

@@ -21,6 +21,18 @@ var i18n = require("@node-red/util").i18n; // TODO: separate module
var runtimeAPI;
function loadResource(lang, namespace) {
var catalog = i18n.i.getResourceBundle(lang, namespace);
if (!catalog) {
var parts = lang.split("-");
if (parts.length == 2) {
var new_lang = parts[0];
return i18n.i.getResourceBundle(new_lang, namespace);
}
}
return catalog;
}
module.exports = {
init: function(_runtimeAPI) {
runtimeAPI = _runtimeAPI;
@@ -33,7 +45,7 @@ module.exports = {
var prevLang = i18n.i.language;
// Trigger a load from disk of the language if it is not the default
i18n.i.changeLanguage(lang, function(){
var catalog = i18n.i.getResourceBundle(lang, namespace);
var catalog = loadResource(lang, namespace);
res.json(catalog||{});
});
i18n.i.changeLanguage(prevLang);