Use i18n plurals for video + channel count

FreeTubeApp · Jul 18, 2023 · 57673fb · 57673fb
1 parent db1d0fc
commit 57673fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
@@ -19,6 +19,8 @@ export default defineComponent({
       url: '',
       channelCount: 0,
       videoCount: 0,
+      channelCountFormatted: '',
+      videoCountFormatted: '',
     }
   },
   computed: {
@@ -32,8 +34,10 @@ export default defineComponent({
   methods: {
     parseData: function () {
       this.url = this.data.url
-      this.channelCount = formatNumber(this.data.channelCount)
-      this.videoCount = formatNumber(this.data.videoCount)
+      this.channelCount = this.data.channelCount
+      this.channelCountFormatted = formatNumber(this.channelCount)
+      this.videoCount = this.data.videoCount
+      this.videoCountFormatted = formatNumber(this.videoCount)
       this.title = this.data.title
     }
   }

diff --git a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue
@@ -31,13 +31,13 @@
           v-if="channelCount"
           class="channelCount"
         >
-          {{ $t('Channel Count', {channelCount: channelCount}) }}
+          {{ $tc('Channel Count', channelCount, {channelCount: channelCountFormatted}) }}
         </span>
         <span
           v-if="videoCount"
           class="videoCount"
         >
-          {{ $t('Video Count', {videoCount: videoCount}) }}
+          • {{ $tc('Video Count', videoCount, {videoCount: videoCountFormatted}) }}
         </span>
       </div>
     </div>

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
@@ -889,5 +889,5 @@ Hashtag:
 Yes: Yes
 No: No
 Ok: Ok
-Video Count: '{videoCount} videos'
-Channel Count: '{channelCount} channels'
+Video Count: '1 video | {videoCount} videos'
+Channel Count: '1 channel | {channelCount} channels'