Fix lang import, use system-languages interface on users

This commit is contained in:
rijkvanzanten
2020-12-08 13:39:50 -05:00
parent 17a6cbc1d3
commit 996e9f34ac
3 changed files with 13 additions and 67 deletions

View File

@@ -1,13 +1,16 @@
af-ZA: Afrikaans (South Africa)
ar-SA: Arabic (Saudi Arabia)
bg-BG: Bulgarian (Bulgaria)
ca-ES: Catalan (Spain)
zh-CN: Chinese (Simplified)
cs-CZ: Czech (Czech Republic)
da-DK: Danish (Denmark)
nl-NL: Dutch (Netherlands)
en-US: English (United States)
et-EE: Estonian (Estonia)
fi-FI: Finnish (Finland)
fr-FR: French (France)
ka-GE: Georgian (Georgia)
de-DE: German (Germany)
el-GR: Greek (Greece)
he-IL: Hebrew (Israel)
@@ -17,14 +20,21 @@ id-ID: Indonesian (Indonesia)
it-IT: Italian (Italy)
ja-JP: Japanese (Japan)
ko-KR: Korean (Korea)
lt-LT: Lithuanian (Lithuania)
ms-MY: Malay (Malaysia)
no-NO: Norwegian (Norway)
pl-PL: Polish (Poland)
pt-BR: Portuguese (Brazil)
pt-PT: Portuguese (Portugal)
ro-RO: Romanian (Romania)
ru-RU: Russian (Russian Federation)
sr-SP: Serbian (Serbia and Montenegro)
si-LK: Sinhala (Sri Lanka)
sk-SK: Slovak (Slovakia)
es-ES: Spanish (Spain)
es-419: Spanish (Latin America)
es-cl: Spanish (Chile)
sv-SE: Swedish (Sweden)
zh-TW: Taiwanese Mandarin (Taiwan)
tr-TR: Turkish (Turkey)
uk-UA: Ukrainian (Ukraine)

View File

@@ -4,7 +4,7 @@ import { RequestError } from '@/api';
import availableLanguages from './available-languages.yaml';
import enUSBase from './en-US/translations.yaml';
import enUSBase from './translations/en-US.yaml';
import dateFormats from './date-formats.yaml';
Vue.use(VueI18n);
@@ -33,7 +33,7 @@ export async function setLanguage(lang: Language): Promise<boolean> {
}
if (loadedLanguages.includes(lang) === false) {
const translations = await import(`@/lang/${lang}/translations.yaml`).catch((err) => console.warn(err));
const translations = await import(`@/lang/translations/${lang}.yaml`).catch((err) => console.warn(err));
i18n.mergeLocaleMessage(lang, translations);
loadedLanguages.push(lang);
}