From 7d90c594fe9530e8f483c6912ffcb80319934a8c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 6 Jan 2023 13:52:49 -0500
Subject: [PATCH] Make in-reply-to i18n-friendly

---
 src/components/status/status.vue | 83 ++++++++++++++++++--------------
 src/i18n/en.json                 |  2 +
 2 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 82eb7ac6..2a394610 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -257,44 +257,57 @@
                 v-if="isReply"
                 class="glued-label reply-glued-label"
               >
-                <StatusPopover
-                  v-if="!isPreview"
-                  :status-id="status.parent_visible && status.in_reply_to_status_id"
-                  class="reply-to-popover"
-                  style="min-width: 0"
-                  :class="{ '-strikethrough': !status.parent_visible }"
+                <i18n-t
+                  keypath="status.reply_to_with_arg"
                 >
-                  <button
-                    class="button-unstyled reply-to"
-                    :aria-label="$t('tool_tip.reply')"
-                    @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
-                  >
-                    <FAIcon
-                      class="fa-scale-110 fa-old-padding"
-                      icon="reply"
-                      flip="horizontal"
-                    />
-                    {{ ' ' }}
-                    <span
-                      class="reply-to-text"
+                  <template #replyToWithIcon>
+                    <StatusPopover
+                      v-if="!isPreview"
+                      :status-id="status.parent_visible && status.in_reply_to_status_id"
+                      class="reply-to-popover"
+                      style="min-width: 0"
+                      :class="{ '-strikethrough': !status.parent_visible }"
                     >
-                      {{ $t('status.reply_to') }}
-                    </span>
-                  </button>
-                </StatusPopover>
+                      <button
+                        class="button-unstyled reply-to"
+                        :aria-label="$t('tool_tip.reply')"
+                        @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
+                      >
+                        <i18n-t keypath="status.reply_to_with_icon">
+                          <template #icon>
+                            <FAIcon
+                              class="fa-scale-110 fa-old-padding"
+                              icon="reply"
+                              flip="horizontal"
+                            />
+                          </template>
+                          <template #replyTo>
+                            <span
+                              class="reply-to-text"
+                            >
+                              {{ $t('status.reply_to') }}
+                            </span>
+                          </template>
+                        </i18n-t>
+                      </button>
+                    </StatusPopover>
 
-                <span
-                  v-else
-                  class="reply-to-no-popover"
-                >
-                  <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
-                </span>
-                <MentionLink
-                  :content="replyToName"
-                  :url="replyProfileLink"
-                  :user-id="status.in_reply_to_user_id"
-                  :user-screen-name="status.in_reply_to_screen_name"
-                />
+                    <span
+                      v-else
+                      class="reply-to-no-popover"
+                    >
+                      <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
+                    </span>
+                  </template>
+                  <template #user>
+                    <MentionLink
+                      :content="replyToName"
+                      :url="replyProfileLink"
+                      :user-id="status.in_reply_to_user_id"
+                      :user-screen-name="status.in_reply_to_screen_name"
+                    />
+                  </template>
+                </i18n-t>
               </span>
 
               <!-- This little wrapper is made for sole purpose of "gluing" -->
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..e98b1d4c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -853,6 +853,8 @@
     "unbookmark": "Unbookmark",
     "delete_confirm": "Do you really want to delete this status?",
     "reply_to": "Reply to",
+    "reply_to_with_icon": "{icon} {replyTo}",
+    "reply_to_with_arg": "{replyToWithIcon} {user}",
     "mentions": "Mentions",
     "replies_list": "Replies:",
     "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",