tyler.durden/dashy
1
0
Fork 0
mirror of https://github.com/Lissy93/dashy.git synced 2025-09-23 09:48:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Improve + refactor the Auto-Detect language apply method

Browse Source
This commit is contained in:
Alicia Sykes 2021-07-25 12:30:43 +01:00
parent 0f5b6a2ec7
commit bc9011ee0b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/App.vue
View File

@ -17,6 +17,7 @@ import {
localStorageKeys, localStorageKeys,
splashScreenTime, splashScreenTime,
visibleComponents as defaultVisibleComponents, visibleComponents as defaultVisibleComponents,
language as defaultLanguage,
} from '@/utils/defaults'; } from '@/utils/defaults';
const Accumulator = new ConfigAccumulator(); const Accumulator = new ConfigAccumulator();
@ -72,23 +73,26 @@ export default {
}, },
/* Checks local storage, then appConfig, and if a custom language is specified, its applied */ /* Checks local storage, then appConfig, and if a custom language is specified, its applied */
applyLanguage() { applyLanguage() {
// If user has specified a language, then check and apply it let language = defaultLanguage; // Language to apply
const lang = localStorage[localStorageKeys.LANGUAGE] || this.appConfig.language; const availibleLocales = this.$i18n.availableLocales; // All available locales
if (lang && this.$i18n.availableLocales.includes(lang)) {
this.$i18n.locale = lang; // If user has specified a language, locally or in config, then check and apply it
const usersLang = localStorage[localStorageKeys.LANGUAGE] || this.appConfig.language;
if (usersLang && availibleLocales.includes(usersLang)) {
language = usersLang;
} else { } else {
// Attempt to apply language automatically, based on their system language // Otherwise, attempt to apply language automatically, based on their system language
let locale;
const usersBorwserLang1 = window.navigator.language || ''; // e.g. en-GB or or '' const usersBorwserLang1 = window.navigator.language || ''; // e.g. en-GB or or ''
const usersBorwserLang2 = usersBorwserLang1.split('-')[0]; // e.g. en or undefined const usersBorwserLang2 = usersBorwserLang1.split('-')[0]; // e.g. en or undefined
const availibleLocales = this.$i18n.availableLocales;
if (availibleLocales.includes(usersBorwserLang1)) { if (availibleLocales.includes(usersBorwserLang1)) {
locale = usersBorwserLang1; language = usersBorwserLang1;
} else if (availibleLocales.includes(usersBorwserLang2)) { } else if (availibleLocales.includes(usersBorwserLang2)) {
locale = usersBorwserLang2; language = usersBorwserLang2;
} }
if (locale) this.$i18n.locale = locale; // If lanuage was found, apply it
} }
// Apply Language
this.$i18n.locale = language;
document.getElementsByTagName('html')[0].setAttribute('lang', language);
}, },
}, },
/* When component mounted, hide splash and initiate the injection of custom styles */ /* When component mounted, hide splash and initiate the injection of custom styles */