generated from Seekra/repository-template
refactor(i18n): move currentLanguage utility to correct location
Moved src/utils/currentLanguage.js to src/features/i18n/utils/navigatorLanguage.js and updated it to only parse the navigator language.
This commit is contained in:
@@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2026 Seekra
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { getNavigatorLanguage } from '../navigatorLanguage';
|
||||||
|
import { describe, expect, test } from 'vitest';
|
||||||
|
|
||||||
|
describe('navigatorLanguage', () => {
|
||||||
|
test.for([
|
||||||
|
{ navigatorLanguage: 'en', expected: 'en'},
|
||||||
|
{ navigatorLanguage: 'de', expected: 'de'},
|
||||||
|
{ navigatorLanguage: 'fr', expected: 'fr'},
|
||||||
|
|
||||||
|
{ navigatorLanguage: 'en-US', expected: 'en'},
|
||||||
|
{ navigatorLanguage: 'en-AU', expected: 'en'},
|
||||||
|
{ navigatorLanguage: 'de-DE', expected: 'de'},
|
||||||
|
{ navigatorLanguage: 'fr-FR', expected: 'fr'},
|
||||||
|
|
||||||
|
{ navigatorLanguage: 'en-us', expected: 'en'},
|
||||||
|
{ navigatorLanguage: 'en-au', expected: 'en'},
|
||||||
|
{ navigatorLanguage: 'de-de', expected: 'de'},
|
||||||
|
{ navigatorLanguage: 'fr-fr', expected: 'fr'},
|
||||||
|
|
||||||
|
{ navigatorLanguage: 'zh-Hans-CN', expected: 'zh'},
|
||||||
|
{ navigatorLanguage: 'zh-Hant-TW', expected: 'zh'},
|
||||||
|
{ navigatorLanguage: 'uz-Latn-UZ', expected: 'uz'},
|
||||||
|
|
||||||
|
{ navigatorLanguage: 'en-US-u-ca-gregory', expected: 'en'},
|
||||||
|
{ navigatorLanguage: 'de-DE-u-co-phonebk', expected: 'de'},
|
||||||
|
{ navigatorLanguage: 'zh-Hant-TW-u-co-phonebk', expected: 'zh'}
|
||||||
|
])('returns language $expected with navigator language $navigatorLanguage', ({ navigatorLanguage, expected }) => {
|
||||||
|
Object.defineProperty(navigator, 'language', {
|
||||||
|
value: navigatorLanguage,
|
||||||
|
configurable: true
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(getNavigatorLanguage()).toBe(expected);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export default function getCurrentLanguage () {
|
export const getNavigatorLanguage = function getNavigatorLanguage () {
|
||||||
const saved = localStorage.getItem('locale');
|
|
||||||
if (saved) return saved;
|
|
||||||
const locale = new Intl.Locale(navigator.language);
|
const locale = new Intl.Locale(navigator.language);
|
||||||
return locale.language;
|
return locale.language;
|
||||||
};
|
};
|
||||||
+1
-2
@@ -15,7 +15,6 @@ limitations under the License.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { createI18n } from 'vue-i18n';
|
import { createI18n } from 'vue-i18n';
|
||||||
import getCurrentLanguage from './utils/currentLanguage';
|
|
||||||
|
|
||||||
export const fallbackLocale = 'en';
|
export const fallbackLocale = 'en';
|
||||||
|
|
||||||
@@ -34,7 +33,7 @@ export const SUPPORTED_LANGUAGES = [
|
|||||||
|
|
||||||
export const i18n = createI18n({
|
export const i18n = createI18n({
|
||||||
legacy: false,
|
legacy: false,
|
||||||
locale: getCurrentLanguage(),
|
locale: fallbackLocale,
|
||||||
fallbackLocale: fallbackLocale,
|
fallbackLocale: fallbackLocale,
|
||||||
messages: {}
|
messages: {}
|
||||||
});
|
});
|
||||||
|
|||||||
+1
-3
@@ -20,7 +20,6 @@ import { createPinia } from 'pinia';
|
|||||||
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
|
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import { i18n, loadLanguage, fallbackLocale } from './i18n';
|
import { i18n, loadLanguage, fallbackLocale } from './i18n';
|
||||||
import getCurrentLanguage from './utils/currentLanguage';
|
|
||||||
import router from './router'
|
import router from './router'
|
||||||
import './styles/common.css'
|
import './styles/common.css'
|
||||||
import './styles/variables/colors.css'
|
import './styles/variables/colors.css'
|
||||||
@@ -53,8 +52,7 @@ import { validateSettingsConfig } from './features/settings/utils/settingsValida
|
|||||||
fonts.forEach((font) => document.fonts.add(font));
|
fonts.forEach((font) => document.fonts.add(font));
|
||||||
|
|
||||||
await loadLanguage(fallbackLocale);
|
await loadLanguage(fallbackLocale);
|
||||||
await loadLanguage(getCurrentLanguage());
|
|
||||||
|
|
||||||
const pinia = createPinia();
|
const pinia = createPinia();
|
||||||
pinia.use(piniaPluginPersistedstate);
|
pinia.use(piniaPluginPersistedstate);
|
||||||
|
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { describe, expect, test } from 'vitest';
|
|
||||||
import getCurrentLanguage from '../currentLanguage';
|
|
||||||
|
|
||||||
describe('currentLanguage', () => {
|
|
||||||
test.for([
|
|
||||||
{ navigatorLanguage: 'en', localStorageLanguage: null, expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'de', localStorageLanguage: null, expected: 'de'},
|
|
||||||
{ navigatorLanguage: 'fr', localStorageLanguage: null, expected: 'fr'},
|
|
||||||
|
|
||||||
{ navigatorLanguage: 'en-US', localStorageLanguage: null, expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'en-AU', localStorageLanguage: null, expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'de-DE', localStorageLanguage: null, expected: 'de'},
|
|
||||||
{ navigatorLanguage: 'fr-FR', localStorageLanguage: null, expected: 'fr'},
|
|
||||||
|
|
||||||
{ navigatorLanguage: 'en-us', localStorageLanguage: null, expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'en-au', localStorageLanguage: null, expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'de-de', localStorageLanguage: null, expected: 'de'},
|
|
||||||
{ navigatorLanguage: 'fr-fr', localStorageLanguage: null, expected: 'fr'},
|
|
||||||
|
|
||||||
{ navigatorLanguage: 'zh-Hans-CN', localStorageLanguage: null, expected: 'zh'},
|
|
||||||
{ navigatorLanguage: 'zh-Hant-TW', localStorageLanguage: null, expected: 'zh'},
|
|
||||||
{ navigatorLanguage: 'uz-Latn-UZ', localStorageLanguage: null, expected: 'uz'},
|
|
||||||
|
|
||||||
{ navigatorLanguage: 'en-US-u-ca-gregory', localStorageLanguage: null, expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'de-DE-u-co-phonebk', localStorageLanguage: null, expected: 'de'},
|
|
||||||
{ navigatorLanguage: 'zh-Hant-TW-u-co-phonebk', localStorageLanguage: null, expected: 'zh'},
|
|
||||||
|
|
||||||
{ navigatorLanguage: 'en', localStorageLanguage: 'de', expected: 'de'},
|
|
||||||
{ navigatorLanguage: 'de-DE', localStorageLanguage: 'en', expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'de-de', localStorageLanguage: 'en', expected: 'en'},
|
|
||||||
{ navigatorLanguage: 'zh-Hans-CN', localStorageLanguage: 'fr', expected: 'fr'},
|
|
||||||
{ navigatorLanguage: 'en-US-u-ca-gregory', localStorageLanguage: 'zh', expected: 'zh'}
|
|
||||||
])('returns the language $expected (navigator: $navigatorLanguage; local storage: $localStorageLanguage)', ({ navigatorLanguage, localStorageLanguage, expected }) => {
|
|
||||||
Object.defineProperty(navigator, 'language', {
|
|
||||||
value: navigatorLanguage,
|
|
||||||
configurable: true
|
|
||||||
});
|
|
||||||
|
|
||||||
if (localStorageLanguage) {
|
|
||||||
localStorage.setItem('locale', localStorageLanguage);
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(getCurrentLanguage()).toBe(expected);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user