@daisy/ace-localize
Advanced tools
Comparing version 1.2.0-beta.6 to 1.2.0-beta.7
@@ -51,3 +51,3 @@ 'use strict'; | ||
function ensureLanguage() { | ||
function ensureLanguage(doneCallback) { | ||
if (i18nextInstance.language !== _currentLanguage) { | ||
@@ -58,7 +58,14 @@ // https://github.com/i18next/i18next/blob/master/CHANGELOG.md#1800 | ||
i18nextInstance.changeLanguage(_currentLanguage).then(_t => { | ||
// noop | ||
if (doneCallback) { | ||
doneCallback(); | ||
} | ||
}).catch(err => { | ||
winston.info('i18next changeLanguage reject: ' + _currentLanguage); | ||
winston.info(err); | ||
if (doneCallback) { | ||
doneCallback(); | ||
} | ||
}); | ||
} else { | ||
doneCallback(); | ||
} | ||
@@ -77,3 +84,3 @@ } | ||
}, | ||
setCurrentLanguage: function (language) { | ||
setCurrentLanguage: function (language, doneCallback) { | ||
@@ -83,3 +90,3 @@ for (const lang of LANGUAGE_KEYS) { | ||
_currentLanguage = language; | ||
// ensureLanguage(); | ||
ensureLanguage(doneCallback); | ||
return; | ||
@@ -90,3 +97,3 @@ } | ||
_currentLanguage = DEFAULT_LANGUAGE; | ||
// ensureLanguage(); | ||
ensureLanguage(doneCallback); | ||
}, | ||
@@ -97,3 +104,3 @@ | ||
ensureLanguage(); | ||
// ensureLanguage(); | ||
@@ -100,0 +107,0 @@ return i18nextInstance.t(msg, opts); |
{ | ||
"name": "@daisy/ace-localize", | ||
"version": "1.2.0-beta.6", | ||
"version": "1.2.0-beta.7", | ||
"description": "Localization utilities for Ace", | ||
@@ -21,3 +21,3 @@ "author": { | ||
"dependencies": { | ||
"i18next": "^17.3.1", | ||
"i18next": "^19.4.1", | ||
"winston": "^3.2.1" | ||
@@ -24,0 +24,0 @@ }, |
@@ -45,3 +45,3 @@ const i18n = require('i18next'); | ||
function ensureLanguage() { | ||
function ensureLanguage(doneCallback) { | ||
if (i18nextInstance.language !== _currentLanguage) { | ||
@@ -52,7 +52,14 @@ // https://github.com/i18next/i18next/blob/master/CHANGELOG.md#1800 | ||
i18nextInstance.changeLanguage(_currentLanguage).then((_t) => { | ||
// noop | ||
if (doneCallback) { | ||
doneCallback(); | ||
} | ||
}).catch((err) => { | ||
winston.info('i18next changeLanguage reject: ' + _currentLanguage); | ||
winston.info(err); | ||
if (doneCallback) { | ||
doneCallback(); | ||
} | ||
}); | ||
} else { | ||
doneCallback(); | ||
} | ||
@@ -71,3 +78,3 @@ } | ||
}, | ||
setCurrentLanguage: function(language) { | ||
setCurrentLanguage: function(language, doneCallback) { | ||
@@ -77,3 +84,3 @@ for (const lang of LANGUAGE_KEYS) { | ||
_currentLanguage = language; | ||
// ensureLanguage(); | ||
ensureLanguage(doneCallback); | ||
return; | ||
@@ -84,3 +91,3 @@ } | ||
_currentLanguage = DEFAULT_LANGUAGE; | ||
// ensureLanguage(); | ||
ensureLanguage(doneCallback); | ||
}, | ||
@@ -91,3 +98,3 @@ | ||
ensureLanguage(); | ||
// ensureLanguage(); | ||
@@ -94,0 +101,0 @@ return i18nextInstance.t(msg, opts); |
7534
196
+ Addedi18next@19.9.2(transitive)
- Removedi18next@17.3.1(transitive)
Updatedi18next@^19.4.1