fix language always being set to English after logged out

This commit is contained in:
MaysWind
2020-11-22 18:48:06 +08:00
parent 1bd33d854f
commit b8d2d687a2
5 changed files with 26 additions and 12 deletions
+10 -7
View File
@@ -92,6 +92,15 @@ Vue.prototype.$locale = {
})
return allCurrencies;
},
init: function () {
if (settings.getLanguage()) {
logger.info(`Current language is ${settings.getLanguage()}`);
} else {
logger.info(`No language is set, use browser default ${getDefaultLanguage()}`);
}
this.setLanguage(settings.getLanguage() || getDefaultLanguage());
}
};
@@ -170,13 +179,7 @@ Vue.filter('accountIcon', (value) => accountIconFilter(value));
Vue.filter('tokenDevice', (value) => tokenDeviceFilter(value));
Vue.filter('tokenIcon', (value) => tokenIconFilter(value));
if (settings.getLanguage()) {
logger.info(`Current language is ${settings.getLanguage()}`);
} else {
logger.info(`No language is set, use browser default ${getDefaultLanguage()}`);
}
Vue.prototype.$locale.setLanguage(settings.getLanguage() || getDefaultLanguage());
Vue.prototype.$locale.init();
if (userstate.isUserLogined()) {
if (!settings.isEnableApplicationLock()) {