Skip to content

Commit

Permalink
feat: prioritize user languages in language picker (#1614)
Browse files Browse the repository at this point in the history
  • Loading branch information
niklaswolf committed Feb 5, 2023
1 parent 297b104 commit 76bad72
Showing 1 changed file with 29 additions and 3 deletions.
32 changes: 29 additions & 3 deletions components/publish/PublishLanguagePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ let { modelValue } = $defineModel<{
}>()
const { t } = useI18n()
const userSettings = useUserSettings()
const languageKeyword = $ref('')
Expand All @@ -17,9 +18,22 @@ const fuse = new Fuse(languagesNameList, {
const languages = $computed(() =>
languageKeyword.trim()
? fuse.search(languageKeyword).map(r => r.item)
: [...languagesNameList].sort(({ code: a }, { code: b }) => {
return a === modelValue ? -1 : b === modelValue ? 1 : a.localeCompare(b)
}),
: [...languagesNameList].filter(entry => !userSettings.value.disabledTranslationLanguages.includes(entry.code))
.sort(({ code: a }, { code: b }) => {
return a === modelValue ? -1 : b === modelValue ? 1 : a.localeCompare(b)
}),
)
const preferredLanguages = computed(() => {
const result = []
for (const langCode of userSettings.value.disabledTranslationLanguages) {
const completeLang = languagesNameList.find(listEntry => listEntry.code === langCode)
if (completeLang)
result.push(completeLang)
}
return result
},
)
function chooseLanguage(language: string) {
Expand All @@ -38,6 +52,18 @@ function chooseLanguage(language: string) {
>
</div>
<div max-h-40vh overflow-auto>
<template v-if="!languageKeyword.trim()">
<CommonDropdownItem
v-for="{ code, nativeName, name } in preferredLanguages"
:key="code"
:text="nativeName"
:description="name"
:checked="code === modelValue"
@click="chooseLanguage(code)"
/>
<hr class="border-base ">
</template>

<CommonDropdownItem
v-for="{ code, nativeName, name } in languages"
:key="code"
Expand Down

0 comments on commit 76bad72

Please sign in to comment.