frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

switched loading order

Browse Source
This commit is contained in:
tot92 2019-11-18 20:45:48 +01:00
parent 4d6828ec14
commit 683c6a748e
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/node_modules/@node-red/util/lib/i18n.js vendored
View File

@ -118,19 +118,12 @@ var MessageFileLoader = {
type: "backend", type: "backend",
init: function (services, backendOptions, i18nextOptions) { }, init: function (services, backendOptions, i18nextOptions) { },
read: function (lng, ns, callback) { read: function (lng, ns, callback) {
// there are two languages to consider: readFile(lng, ns)
// 1) the actual language lng (e. g. 'en-US' or 'de-DE', 'fr-FR',...) .then(data => callback(null, data))
// 2) the base language (e. g. 'en', 'de', 'fr',...) .catch(() => {
// if reading language file fails -> try reading base language (e. g. 'fr' instead of 'fr-FR' or 'de' for 'de-DE')
var baseLng = lng.split('-')[0]; var baseLng = lng.split('-')[0];
// read base language (e. g. 'de'), then actual language (e. g. 'de-DE') readFile(baseLng, ns).then(baseData => callback(null, baseData)).catch(err => callback(err));
readFile(baseLng, ns).then(
baseData => {
// scenario 1: reading base language was successful -> read actual language -> if this fails, return base language data
readFile(lng, ns).then(data => callback(null, data), () => callback(null, baseData))
},
() => {
// scenario 2: reading base language failed -> read actual language -> if this fails too, return error
readFile(lng, ns).then(data => callback(null, data), err => callback(err))
}); });
} }
} }