Merge branch 'master' into ai/issue-48
Some checks failed
Test / test (push) Failing after 2s

This commit is contained in:
2026-10-15 11:14:37 +00:00
3 changed files with 211 additions and 16 deletions

View File

@@ -16,13 +16,6 @@ const data = props.data;
const { locale } = useI18n();
const changeLocale = (lang) => {
console.log(lang);
locale.value = lang.code;
SetUserSetting('lang', lang.code);
}
const id = data.id;
const rows = ref([{id: "account-settings", value: "settings.tabs.account-settings"}]);
@@ -37,13 +30,40 @@ function getLocaleFromCode(code){
}
}
const selectedLocale = ref("");
// The language to show in the dropdown: always one Dragonroll offers, because a
// user that never picked one has none stored.
function localeToShow(code){
return getLocaleFromCode(code) || locales[0];
}
// vue-i18n answers every translation with `SyntaxError: cannot support locale type`
// once it is given a locale it has no messages for, and the locale is global: putting
// a language that is not stored (the server answers `settings: undefined` for a user
// that never picked one) or one no longer offered took the settings window and the
// main menu behind it down (issue #47). Only known codes go into `locale`.
function applyLanguage(code){
const stored = getLocaleFromCode(code);
if(!stored) return false;
locale.value = stored.code;
selectedLocale.value = stored;
return true;
}
const selectedLocale = ref(localeToShow(locale.value));
const changeLocale = (lang) => {
if(!applyLanguage(lang?.code)) return;
SetUserSetting('lang', lang.code);
}
onBeforeMount(() => {
GetUserSetting('lang').then(value => {
locale.value = value;
selectedLocale.value = getLocaleFromCode(value); // Set selected in dropdown
});
if(GetUser().admin) rows.value.push({
// Set selected in dropdown. Without settings to read from the server the language
// Dragonroll is already showing stays the one on screen.
GetUserSetting('lang')
.then((value) => applyLanguage(value))
.catch(() => {});
if(GetUser()?.admin) rows.value.push({
id: "site-administration",
value: "settings.tabs.site-administration"
});
@@ -78,7 +98,7 @@ function OpenManageAccounts(){
}
const getLocaleName = (locale) => {
return locale.name;
return locale ? locale.name : "";
}
</script>