diff --git a/changelog.d/mutes.change b/changelog.d/mutes.change deleted file mode 100644 index f55a8abbf..000000000 --- a/changelog.d/mutes.change +++ /dev/null @@ -1 +0,0 @@ -better display of mutes diff --git a/changelog.d/streaming-op-after-conn.change b/changelog.d/streaming-op-after-conn.change deleted file mode 100644 index 73a79d843..000000000 --- a/changelog.d/streaming-op-after-conn.change +++ /dev/null @@ -1 +0,0 @@ -Authenticate and subscribe to streaming after connection diff --git a/package.json b/package.json index 182a541d9..fa08593f0 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "url": "0.11.0", "utf8": "3.0.0", "vue": "3.2.45", - "vue-i18n": "10", + "vue-i18n": "9.2.2", "vue-router": "4.1.6", "vue-template-compiler": "2.7.14", "vue-virtual-scroller": "^2.0.0-beta.7", diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 52d578b1e..1c290b900 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -73,7 +73,7 @@ @@ -146,7 +146,7 @@ diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index 09d44b0bd..9baf63f22 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -293,12 +293,9 @@ const EmojiInput = { })) this.highlighted = this.defaultCandidateIndex this.$refs.screenReaderNotice.announce( - this.$t( - 'tool_tip.autocomplete_available', - { number: this.suggestions.length }, - this.suggestions.length - ) - ) + this.$tc('tool_tip.autocomplete_available', + this.suggestions.length, + { number: this.suggestions.length })) } }, methods: { diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js index 861fbe542..77f8ecbb2 100644 --- a/src/components/emoji_reactions/emoji_reactions.js +++ b/src/components/emoji_reactions/emoji_reactions.js @@ -92,7 +92,7 @@ const EmojiReactions = { toggled: this.reactedWith(reaction.name) } ], - 'aria-label': this.$t('status.reaction_count_label', { num: reaction.count }, reaction.count) + 'aria-label': this.$tc('status.reaction_count_label', reaction.count, { num: reaction.count }) } } } diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue index 5728dc98f..ffbb43eb3 100644 --- a/src/components/extra_notifications/extra_notifications.vue +++ b/src/components/extra_notifications/extra_notifications.vue @@ -14,7 +14,7 @@ class="fa-scale-110 icon" icon="comments" /> - {{ $t('notifications.unread_chats', { num: unreadChatCount }, unreadChatCount) }} + {{ $tc('notifications.unread_chats', unreadChatCount, { num: unreadChatCount }) }}
- {{ $t('notifications.unread_announcements', { num: unreadAnnouncementCount }, unreadAnnouncementCount) }} + {{ $tc('notifications.unread_announcements', unreadAnnouncementCount, { num: unreadAnnouncementCount }) }}
- {{ $t('notifications.unread_follow_requests', { num: followRequestCount }, followRequestCount) }} + {{ $tc('notifications.unread_follow_requests', followRequestCount, { num: followRequestCount }) }}