From a1c0642bb553fae4d0a82682657d4ecba3bb280a Mon Sep 17 00:00:00 2001
From: Sol Fisher Romanoff <sol@solfisher.com>
Date: Sat, 12 Nov 2022 18:35:25 +0200
Subject: [PATCH 1/2] Use correct pluralization in reports tab

---
 src/components/mod_modal/tabs/reports_tab/report_card.vue | 4 ++--
 src/i18n/en.json                                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/mod_modal/tabs/reports_tab/report_card.vue b/src/components/mod_modal/tabs/reports_tab/report_card.vue
index 6cc034b1..e77afa79 100644
--- a/src/components/mod_modal/tabs/reports_tab/report_card.vue
+++ b/src/components/mod_modal/tabs/reports_tab/report_card.vue
@@ -54,7 +54,7 @@
           class="button button-unstyled dropdown-header"
           @click="toggleStatuses"
         >
-          {{ this.statuses.length + ' ' + $t('moderation.reports.statuses') }}
+          {{ $tc('moderation.reports.statuses', statuses.length - 1, { count: statuses.length }) }}
           <FAIcon
             class="timelines-chevron"
             fixed-width
@@ -81,7 +81,7 @@
           class="button button-unstyled dropdown-header"
           @click="toggleNotes"
         >
-          {{ this.notes.length + ' ' + $t('moderation.reports.notes') }}
+          {{ $tc('moderation.reports.notes', notes.length - 1, { count: notes.length }) }}
           <FAIcon
             class="timelines-chevron"
             fixed-width
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9cb5e3c7..3a6e5281 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -278,13 +278,13 @@
         "delete_note_title": "Confirm deletion",
         "no_content": "No description given",
         "note_placeholder": "Leave a note...",
-        "notes": "notes",
+        "notes": "{ count } note | { count } notes",
         "reopen": "Reopen",
         "report": "Report on",
         "reports": "Reports",
         "resolve": "Resolve",
         "show_closed": "Show closed",
-        "statuses": "statuses",
+        "statuses": "{ count } status | { count } statuses",
         "tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions",
         "tags": "Set post restrictions"
       },

From 0770981a2070ac1fe3078e03c8f2a526ade15752 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sat, 12 Nov 2022 19:06:39 +0000
Subject: [PATCH 2/2] Ensure we don't fail if translation is disabled

---
 src/components/settings_modal/tabs/general_tab.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 6e31366b..763a588d 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -105,8 +105,12 @@ const GeneralTab = {
       return this.$store.getters.mergedConfig.profileVersion
     },
     translationLanguages () {
-      const langs = this.$store.state.instance.supportedTranslationLanguages || { source: [] }
-      return langs.source.map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
+      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 []
     },
     translationLanguage: {
       get: function () { return this.$store.getters.mergedConfig.translationLanguage },