Merge remote-tracking branch 'upstream/master' into improve-translatables

This commit is contained in:
Ivan Bratović
2021-11-29 12:51:08 +01:00
10 changed files with 101 additions and 86 deletions

View File

@@ -4,7 +4,7 @@
<label for="language" class="form-label">
{{ $t("Language") }}
</label>
<select id="language" v-model="$i18n.locale" class="form-select">
<select id="language" v-model="$root.language" class="form-select">
<option
v-for="(lang, i) in $i18n.availableLocales"
:key="`Lang${i}`"
@@ -116,14 +116,8 @@
</template>
<script>
import { setPageLocale } from "../../util-frontend";
export default {
watch: {
"$i18n.locale"() {
localStorage.locale = this.$i18n.locale;
setPageLocale();
},
},
};
</script>

View File

@@ -122,6 +122,7 @@
<HiddenInput
id="steamAPIKey"
v-model="settings.steamAPIKey"
autocomplete="one-time-code"
/>
<div class="form-text">
{{ $t("steamApiKeyDescription") }}