fix language always being set to English after logged out

src/mobile-main.js

@@ -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()) {
+Vue.prototype.$locale.init();
-    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());
 
 if (userstate.isUserLogined()) {
     if (!settings.isEnableApplicationLock()) {

src/views/mobile/Login.vue

@@ -185,7 +185,10 @@ export default {
                     return;
                 }
 
-                self.$settings.setEnableApplicationLock(false);
+                if (self.$settings.isEnableApplicationLock()) {
+                    self.$settings.setEnableApplicationLock(false);
+                }
+
                 self.$user.updateTokenAndUserInfo(data.result);
 
                 if (self.$settings.isAutoUpdateExchangeRatesData()) {
@@ -259,7 +262,10 @@ export default {
                     return;
                 }
 
-                self.$settings.setEnableApplicationLock(false);
+                if (self.$settings.isEnableApplicationLock()) {
+                    self.$settings.setEnableApplicationLock(false);
+                }
+
                 self.$user.updateTokenAndUserInfo(data.result);
 
                 if (self.$settings.isAutoUpdateExchangeRatesData()) {

src/views/mobile/Settings.vue

@@ -185,8 +185,10 @@ export default {
                     }
 
                     self.$user.clearTokenAndUserInfo();
-                    self.$settings.clearSettings();
                     self.$exchangeRates.clearExchangeRates();
+                    self.$settings.clearSettings();
+                    self.$locale.init();
+
                     router.navigate('/');
                 }).catch(error => {
                     self.$logger.error('failed to log out', error);

src/views/mobile/Signup.vue

@@ -157,7 +157,9 @@ export default {
                     return;
                 }
 
-                self.$settings.setEnableApplicationLock(false);
+                if (self.$settings.isEnableApplicationLock()) {
+                    self.$settings.setEnableApplicationLock(false);
+                }
 
                 if (self.$utilities.isString(data.result.token)) {
                     self.$user.updateTokenAndUserInfo(data.result);

src/views/mobile/Unlock.vue

@@ -92,8 +92,9 @@ export default {
             const router = this.$f7router;
 
             this.$user.clearTokenAndUserInfo();
-            this.$settings.clearSettings();
             this.$exchangeRates.clearExchangeRates();
+            this.$settings.clearSettings();
+            this.$locale.init();
 
             router.navigate('/login', {
                 clearPreviousHistory: true