AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

Merge pull request 'hotfix: translation' (#207) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
Reviewed-on: AkkomaGang/pleroma-fe#207
This commit is contained in:
floatingghost 2022-11-12 19:08:20 +00:00
commit 80a519d7e4
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/mod_modal/tabs/reports_tab/report_card.vue
View file

@ -54,7 +54,7 @@
class="button button-unstyled dropdown-header" class="button button-unstyled dropdown-header"
@click="toggleStatuses" @click="toggleStatuses"
> >
{{ this.statuses.length + ' ' + $t('moderation.reports.statuses') }} {{ $tc('moderation.reports.statuses', statuses.length - 1, { count: statuses.length }) }}
<FAIcon <FAIcon
class="timelines-chevron" class="timelines-chevron"
fixed-width fixed-width
@ -81,7 +81,7 @@
class="button button-unstyled dropdown-header" class="button button-unstyled dropdown-header"
@click="toggleNotes" @click="toggleNotes"
> >
{{ this.notes.length + ' ' + $t('moderation.reports.notes') }} {{ $tc('moderation.reports.notes', notes.length - 1, { count: notes.length }) }}
<FAIcon <FAIcon
class="timelines-chevron" class="timelines-chevron"
fixed-width fixed-width

6
src/components/settings_modal/tabs/general_tab.js
View file

@ -105,8 +105,12 @@ const GeneralTab = {
return this.$store.getters.mergedConfig.profileVersion return this.$store.getters.mergedConfig.profileVersion
}, },
translationLanguages () { translationLanguages () {
const langs = this.$store.state.instance.supportedTranslationLanguages || { source: [] } const langs = this.$store.state.instance.supportedTranslationLanguages
if (langs && langs.source) {
return langs.source.map(lang => ({ key: lang.code, value: lang.code, label: lang.name })) return langs.source.map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
}
return []
}, },
translationLanguage: { translationLanguage: {
get: function () { return this.$store.getters.mergedConfig.translationLanguage }, get: function () { return this.$store.getters.mergedConfig.translationLanguage },

4
src/i18n/en.json
View file

@ -283,13 +283,13 @@
"delete_note_title": "Confirm deletion", "delete_note_title": "Confirm deletion",
"no_content": "No description given", "no_content": "No description given",
"note_placeholder": "Leave a note...", "note_placeholder": "Leave a note...",
"notes": "notes", "notes": "{ count } note | { count } notes",
"reopen": "Reopen", "reopen": "Reopen",
"report": "Report on", "report": "Report on",
"reports": "Reports", "reports": "Reports",
"resolve": "Resolve", "resolve": "Resolve",
"show_closed": "Show closed", "show_closed": "Show closed",
"statuses": "statuses", "statuses": "{ count } status | { count } statuses",
"tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions", "tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions",
"tags": "Set post restrictions" "tags": "Set post restrictions"
}, },