diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-01-25 23:47:29 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-01-25 23:47:29 +0000 |
| commit | a9716701be26c696ee1b908a1787b34880175ffa (patch) | |
| tree | 6f7f52528e6984e66b2985faeeedde3d1933b2c2 /src/modules | |
| parent | a3c971526a04aee8a8f42ce3e39d0195a442335d (diff) | |
| parent | 7e2ae2ba9565a58944fe8915f054f8eef812ee54 (diff) | |
Merge branch 'from/develop/tusooa/multi-iface-lang' into 'develop'
Multiple interface languages support
See merge request pleroma/pleroma-fe!1568
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 5 | ||||
| -rw-r--r-- | src/modules/instance.js | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index 3cd6888f..1a0e0fc8 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -184,7 +184,10 @@ const config = { case 'interfaceLanguage': messages.setLanguage(this.getters.i18n, value) dispatch('loadUnicodeEmojiData', value) - Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value)) + Cookies.set( + BACKEND_LANGUAGE_COOKIE_NAME, + localeService.internalToBackendLocaleMulti(value) + ) break case 'thirdColumnMode': dispatch('setLayoutWidth', undefined) diff --git a/src/modules/instance.js b/src/modules/instance.js index 8e8d13d3..9e47a13a 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -286,8 +286,13 @@ const instance = { langList .map(async lang => { if (!state.unicodeEmojiAnnotations[lang]) { - const annotations = await loadAnnotations(lang) - commit('setUnicodeEmojiAnnotations', { lang, annotations }) + try { + const annotations = await loadAnnotations(lang) + commit('setUnicodeEmojiAnnotations', { lang, annotations }) + } catch (e) { + console.warn(`Error loading unicode emoji annotations for ${lang}: `, e) + // ignore + } } })) }, |