Skip to content

Commit

Permalink
use user language as first on translations (#8327)
Browse files Browse the repository at this point in the history
  • Loading branch information
joselcvarela committed Sep 26, 2021
1 parent d949423 commit 437e52a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions app/src/interfaces/translations/translations.vue
Expand Up @@ -49,7 +49,7 @@
<script lang="ts">
import LanguageSelect from './language-select.vue';
import { computed, defineComponent, PropType, Ref, ref, toRefs, watch, unref } from 'vue';
import { useFieldsStore, useRelationsStore } from '@/stores/';
import { useFieldsStore, useRelationsStore, useUserStore } from '@/stores/';
import { useI18n } from 'vue-i18n';
import api from '@/api';
import { Relation } from '@directus/shared/types';
Expand Down Expand Up @@ -89,6 +89,7 @@ export default defineComponent({
const fieldsStore = useFieldsStore();
const relationsStore = useRelationsStore();
const { t } = useI18n();
const userStore = useUserStore();
const { width } = useWindowSize();
Expand Down Expand Up @@ -300,7 +301,12 @@ export default defineComponent({
languages.value = response.data.data;
if (!firstLang.value) {
firstLang.value = response.data.data?.[0]?.[languagesPrimaryKeyField.value];
const languages = response.data.data;
const userLang = languages?.find(
(lang) => lang[languagesPrimaryKeyField.value] === userStore.currentUser.language
)?.[languagesPrimaryKeyField.value];
firstLang.value = userLang ?? languages?.[0]?.[languagesPrimaryKeyField.value];
}
if (!secondLang.value) {
Expand Down

0 comments on commit 437e52a

Please sign in to comment.