1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge pull request #3281 from node-red/i18n-space-ns-fix

Fix i18n handling of namespaces with spaces in
This commit is contained in:
Nick O'Leary 2021-12-01 15:15:38 +00:00 committed by GitHub
commit 1fa13efe19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -38,6 +38,8 @@ RED.i18n = (function() {
defaultNS: "editor", defaultNS: "editor",
fallbackLng: ['en-US'], fallbackLng: ['en-US'],
returnObjects: true, returnObjects: true,
keySeparator: ".",
nsSeparator: ":",
interpolation: { interpolation: {
unescapeSuffix: 'HTML', unescapeSuffix: 'HTML',
escapeValue: false, escapeValue: false,

View File

@ -136,8 +136,6 @@ function getCurrentLocale() {
function init(settings) { function init(settings) {
if (!initPromise) { if (!initPromise) {
// Keep this as a 'when' promise as top-level red.js uses 'otherwise'
// and embedded users of NR may have copied that.
initPromise = new Promise((resolve,reject) => { initPromise = new Promise((resolve,reject) => {
i18n.use(MessageFileLoader); i18n.use(MessageFileLoader);
var opt = { var opt = {
@ -146,6 +144,8 @@ function init(settings) {
defaultNS: "runtime", defaultNS: "runtime",
ns: [], ns: [],
fallbackLng: defaultLang, fallbackLng: defaultLang,
keySeparator: ".",
nsSeparator: ":",
interpolation: { interpolation: {
unescapeSuffix: 'HTML', unescapeSuffix: 'HTML',
escapeValue: false, escapeValue: false,