Merge branch 'consistent-mutes' into shigusegubu-themes3

src/components/status/status.vue

@@ -292,7 +292,7 @@
                       v-if="!isPreview"
                       :status-id="status.parent_visible && status.in_reply_to_status_id"
                       class="reply-to-popover"
-                      style="min-width: 0"
+                      style="min-width: 0;"
                       :class="{ '-strikethrough': !status.parent_visible }"
                     >
                       <button
@@ -598,13 +598,15 @@
         class="status-container reply-form"
       >
         <PostStatusForm
+          ref="postStatusForm"
           class="reply-body"
           :reply-to="status.id"
           :attentions="status.attentions"
           :replied-user="status.user"
           :copy-message-scope="status.visibility"
           :subject="replySubject"
-          @posted="toggleReplying"
+          @posted="doToggleReplying"
+          @can-close="doToggleReplying"
         />
       </div>
     </template>

src/components/timeago/timeago.vue

@@ -40,7 +40,7 @@ export default {
       return this.timeAsDate.toLocaleString(this.browserLocale)
     },
     relativeTimeString () {
-      const timeString = this.$i18n.tc(this.relativeTime.key, this.relativeTime.num, [this.relativeTime.num])
+      const timeString = this.$i18n.t(this.relativeTime.key, [this.relativeTime.num], this.relativeTime.num)
 
       if (typeof this.templateKey === 'string' && this.relativeTime.key !== 'time.now') {
         return this.$i18n.t(this.templateKey, [timeString])

src/i18n/en.json

@@ -1407,6 +1407,7 @@
   },
   "tool_tip": {
     "media_upload": "Upload media",
+    "mentions": "Mentions",
     "repeat": "Repeat",
     "reply": "Reply",
     "favorite": "Favorite",