Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make language label not translatable (#1343)

Browse Source
This commit is contained in:
Sasha Sorokin 2023-09-02 15:38:10 +02:00 committed by GitHub
parent dca5b9f197
commit 5d34af6ac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
locales/en-US/index.json
View File

@ -140,9 +140,6 @@
"settings.language.languages.automatic": { "settings.language.languages.automatic": {
"message": "Sync with the system language" "message": "Sync with the system language"
}, },
"settings.language.languages.language-label": {
"message": "{translatedName}. {displayName}"
},
"settings.language.languages.language-label-applying": { "settings.language.languages.language-label-applying": {
"message": "{label}. Applying..." "message": "{label}. Applying..."
}, },

9
pages/settings/language.vue
View File

@ -43,10 +43,6 @@ const messages = defineMessages({
id: 'settings.language.languages.load-failed', id: 'settings.language.languages.load-failed',
defaultMessage: 'Cannot load this language. Try again in a bit.', defaultMessage: 'Cannot load this language. Try again in a bit.',
}, },
languageLabel: {
id: 'settings.language.languages.language-label',
defaultMessage: '{translatedName}. {displayName}',
},
languageLabelApplying: { languageLabelApplying: {
id: 'settings.language.languages.language-label-applying', id: 'settings.language.languages.language-label-applying',
defaultMessage: '{label}. Applying...', defaultMessage: '{label}. Applying...',
@ -275,10 +271,7 @@ function onItemClick(e: MouseEvent, locale: Locale) {
function getItemLabel(locale: Locale) { function getItemLabel(locale: Locale) {
const label = locale.auto const label = locale.auto
? formatMessage(messages.automaticLocale) ? formatMessage(messages.automaticLocale)
: formatMessage(messages.languageLabel, { : `${locale.translatedName}. ${locale.displayName}`
translatedName: locale.translatedName,
displayName: locale.displayName,
})
if ($changingTo.value === locale.tag) { if ($changingTo.value === locale.tag) {
return formatMessage(messages.languageLabelApplying, { label }) return formatMessage(messages.languageLabelApplying, { label })