Skip to content

Commit

Permalink
Automatically set translation according to browser settings (BlueMap-…
Browse files Browse the repository at this point in the history
…Minecraft#615)

* Automatically set translation according to browser settings

* Fix languages not saving properly
  • Loading branch information
NikitaCartes authored Oct 9, 2024
1 parent b8f4574 commit e59d035
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 11 deletions.
File renamed without changes.
File renamed without changes.
15 changes: 8 additions & 7 deletions common/webapp/public/lang/settings.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
default: "en"
useBrowserLanguage: true
languages: [
// remove the languages you don't need reorder them or add your own
{ locale: "cs", name: "Czech" }
Expand All @@ -11,22 +12,22 @@
{ locale: "lv", name: "Latviešu" }
{ locale: "hu", name: "Magyar" }
{ locale: "nl", name: "Nederlands" }
{ locale: "no_nb", name: "Norsk bokmål" }
{ locale: "nb", name: "Norsk bokmål" }
{ locale: "pl", name: "Polski" }
{ locale: "pt_PT", name: "Português (Portugal)" }
{ locale: "pt-PT", name: "Português (Portugal)" }
{ locale: "ru", name: "Русский" }
{ locale: "sr_latn", name: "Srpski (latinica)" }
{ locale: "sr_cyrl", name: "Српски (ћирилица)" }
{ locale: "sr-Latn-RS", name: "Srpski (latinica)" }
{ locale: "sr-Cyrl-RS", name: "Српски (ћирилица)" }
{ locale: "fi", name: "Suomi" }
{ locale: "es", name: "Spanish" }
{ locale: "sv", name: "Svenska" }
{ locale: "tr", name: "Türkçe" }
{ locale: "th", name: "ภาษาไทย" }
{ locale: "ua", name: "Українська" }
{ locale: "ja", name: "日本語" }
{ locale: "zh_CN", name: "简体中文(中国大陆)" }
{ locale: "zh_TW", name: "繁體中文(台灣)" }
{ locale: "zh_HK", name: "繁體中文(香港特別行政區)" }
{ locale: "zh-CN", name: "简体中文(中国大陆)" }
{ locale: "zh-TW", name: "繁體中文(台灣)" }
{ locale: "zh-HK", name: "繁體中文(香港特別行政區)" }
{ locale: "ko", name: "한국어" }
{ locale: "vi", name: "Tiếng Việt"}
]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions common/webapp/src/components/Menu/SettingsMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<Group v-if="languages.length > 1" :title="$t('language.title')">
<SimpleButton v-for="lang of languages" :key="lang.locale"
:active="lang.locale === $i18n.locale"
@action="changeLanguage(lang.locale); $bluemap.saveUserSettings();"
@action="changeLanguage(lang.locale);"
>{{lang.name}}</SimpleButton>
</Group>

Expand Down Expand Up @@ -117,8 +117,9 @@ name: "SettingsMenu",
let f = parseFloat(value);
return f === 0 ? this.$t("renderDistance.off") : f.toFixed(0);
},
changeLanguage(lang) {
setLanguage(lang)
async changeLanguage(lang) {
await setLanguage(lang);
this.$bluemap.saveUserSettings();
}
}
}
Expand Down
21 changes: 20 additions & 1 deletion common/webapp/src/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,25 @@ export async function setLanguage(lang) {

export async function loadLanguageSettings() {
let settings = await fetchHocon(`./lang/settings.conf`);
let selectedLanguage = null;

if (settings.useBrowserLanguage) {
const availableLanguages = settings.languages.map(lang => lang.locale);

for (let browserLanguage of navigator.languages) {
selectedLanguage = availableLanguages.find(lang => lang === browserLanguage);
if (selectedLanguage) break;

let baseBrowserLanguage = browserLanguage.split('-')[0];
selectedLanguage = availableLanguages.find(lang => lang.startsWith(baseBrowserLanguage));
if (selectedLanguage) break;
}
}

if (!selectedLanguage) {
selectedLanguage = settings.default;
}

i18n.languages = settings.languages;
await setLanguage(settings.default);
await setLanguage(selectedLanguage);
}

0 comments on commit e59d035

Please sign in to comment.