diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/i18n.js | 11 | ||||
-rw-r--r-- | src/locales/en-US.json (renamed from src/locales/en.json) | 0 | ||||
-rw-r--r-- | src/views/Login/Login.vue | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/i18n.js b/src/i18n.js index 09b3f4ca..745d0504 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -21,9 +21,12 @@ function loadLocaleMessages() { } export default new VueI18n({ - // default language is English - locale: 'en', - // locale messages with a message key that doesn't exist will fallback to English - fallbackLocale: 'en', + // Get default locale from local storage + locale: localStorage.getItem('storedLanguage'), + // Locales that don't exist will fallback to English + fallbackLocale: 'en-US', + // Falling back to fallbackLocale generates two console warnings + // Silent fallback suppresses console warnings when using fallback + silentFallbackWarn: true, messages: loadLocaleMessages() }); diff --git a/src/locales/en.json b/src/locales/en-US.json index 0de52987..0de52987 100644 --- a/src/locales/en.json +++ b/src/locales/en-US.json diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 10ebb930..fd6e711c 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -82,6 +82,7 @@ <script> import { required } from 'vuelidate/lib/validators'; import VuelidateMixin from '../../components/Mixins/VuelidateMixin.js'; +import i18n from '../../i18n'; export default { name: 'Login', @@ -94,9 +95,8 @@ export default { }, disableSubmitButton: false, languages: [ - { value: null, text: this.$t('global.form.selectAnOption') }, { - value: 'en', + value: 'en-US', text: this.$t('pageLogin.form.english') }, { @@ -131,6 +131,7 @@ export default { this.$store .dispatch('authentication/login', [username, password]) .then(() => this.$router.push('/')) + .then(localStorage.setItem('storedLanguage', i18n.locale)) .catch(error => console.log(error)) .finally(() => (this.disableSubmitButton = false)); } |