Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

⬆️ Upgrades vue-i18n, so no more legacy mode

Alicia Sykes9e274ebe13af
diff --git a/src/App.vue b/src/App.vue
index 4f6bdb8a..f14c1cce 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,6 +24,7 @@ import { viewFromPath } from '@/utils/config/ConfigHelpers';
import { applyTheme } from '@/utils/Theming';
import Keys from '@/utils/StoreMutations';
import { loadLocale } from '@/utils/languages';
+import i18n from '@/utils/i18n';
import {
localStorageKeys,
splashScreenTime,
@@ -218,7 +219,7 @@ export default {
const language = this.getLanguage();
try {
const msg = await loadLocale(language);
- this.$i18n.setLocaleMessage(language, msg);
+ i18n.global.setLocaleMessage(language, msg);
} catch (e) {
ErrorHandler(`Failed to load locale '${language}'`, e);
}
diff --git a/src/components/Settings/LanguageSwitcher.vue b/src/components/Settings/LanguageSwitcher.vue
index b8ff6da9..dbe7f1bf 100644
--- a/src/components/Settings/LanguageSwitcher.vue
+++ b/src/components/Settings/LanguageSwitcher.vue
@@ -34,6 +34,7 @@ import SaveConfigIcon from '@/assets/interface-icons/save-config.svg';
import ErrorHandler from '@/utils/logging/ErrorHandler';
import Keys from '@/utils/StoreMutations';
import { languages, loadLocale } from '@/utils/languages';
+import i18n from '@/utils/i18n';
import { getUsersLanguage } from '@/utils/config/ConfigHelpers';
import { localStorageKeys, modalNames } from '@/utils/config/defaults';
@@ -102,7 +103,7 @@ export default {
}
try {
const msg = await loadLocale(selectedLanguage.code);
- this.$i18n.setLocaleMessage(selectedLanguage.code, msg);
+ i18n.global.setLocaleMessage(selectedLanguage.code, msg);
} catch (e) {
this.$toast.error('Unable to update language');
ErrorHandler(`Failed to load locale '${selectedLanguage.code}'`, e);
diff --git a/src/utils/i18n.js b/src/utils/i18n.js
index 7aad6ef2..9e8d147e 100644
--- a/src/utils/i18n.js
+++ b/src/utils/i18n.js
@@ -10,7 +10,8 @@ languages.forEach(({ code }) => {
});
const i18n = createI18n({
- legacy: true,
+ legacy: false,
+ globalInjection: true,
locale: defaultLanguage,
fallbackLocale: defaultLanguage,
messages: registered,