fix: Migrated all badges

null2264 · Oct 26, 2023 · 716a46c · 716a46c
1 parent 70fe9da
commit 716a46c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/src/locales/en-US/app.ftl b/src/locales/en-US/app.ftl
@@ -88,13 +88,15 @@ account-Header--manage-list--MenuItem = { -icon }<wrapper>Add or Remove from lis
 account-Status--block = Blocked
 account-Status--deactivated = Deactivated
 account-Status--domain-block = Domain blocked
+account-Status--follows-you = Follows you
 account-Status--familiar-followers = Followed by { -accounts }
 account-Status--familiar-followers-empty = No one you know follows { -display-name }
 account-Status--familiar-followers-more =
   { $count ->
     [one] { $count } other you follow
     *[other] { $count } others you follow
   }
+account-Status--muted = Muted
 account-StatusAction--block = Block @{ $name }
 account-StatusAction--block--MenuItem = { -icon }<wrapper>Block @{ $name }</wrapper>{ -emblem }
   .title = Block @{ $name }

diff --git a/src/locales/id-ID/app.ftl b/src/locales/id-ID/app.ftl
@@ -43,6 +43,8 @@ account-Header--manage-list--MenuItem = { -icon }<wrapper>Tambah atau Hapus dari
 account-Status--block = Terblokir
 account-Status--deactivated = Dinonaktifkan
 account-Status--domain-block = Domain terblokir
+account-Status--follows-you = Mengikuti anda
+account-Status--muted = Dibisukan
 account-StatusAction--block = Blokir @{ $name }
 account-StatusAction--block--MenuItem = { -icon }<wrapper>Blokir @{ $name }</wrapper>{ -emblem }
   .title = Blokir @{ $name }

diff --git a/src/locales/ja-JP/app.ftl b/src/locales/ja-JP/app.ftl
@@ -47,9 +47,11 @@ account-Header--manage-list--MenuItem = { -icon }<wrapper>リストから追加
 account-Status--block = ブロック済み
 account-Status--deactivated = 非アクティブ化
 account-Status--domain-block = ドメイン非表示
+account-Status--follows-you = フォローされています
 account-Status--familiar-followers = { -accounts }にフォローされています
 account-Status--familiar-followers-empty = あなたの知り合いで{ -display-name }さんをフォローしている人はいません。
 account-Status--familiar-followers-more = { $count } 人のおすすめユーザー
+account-Status--muted = ミュートしています
 account-StatusAction--block = @{ $name }さんをブロック
 account-StatusAction--block--MenuItem = { -icon }<wrapper>@{ $name }さんをブロック</wrapper>{ -emblem }
   .title = @{ $name }さんをブロック

diff --git a/src/soapbox/features/account/components/header.tsx b/src/soapbox/features/account/components/header.tsx
@@ -524,19 +524,17 @@ const Header: React.FC<IHeader> = ({ account }) => {
         <Badge
           key='followed_by'
           slug='opaque'
-          title={<FormattedMessage id='account.follows_you' defaultMessage='Follows you' />}
+          title='Follows you'
+          id='account-Status--follows-you'
         />,
       );
     } else if (ownAccount.id !== account.id && account.relationship?.blocking) {
       info.push(
         <Badge
           key='blocked'
           slug='opaque'
-          title={
-            <Localized id='account-Status--block'>
-              <span>Blocked</span>
-            </Localized>
-          }
+          title='Blocked'
+          id='account-Status--block'
         />,
       );
     }
@@ -546,7 +544,8 @@ const Header: React.FC<IHeader> = ({ account }) => {
         <Badge
           key='muted'
           slug='opaque'
-          title={<FormattedMessage id='account.muted' defaultMessage='Muted' />}
+          title='Muted'
+          id='account-Status--muted'
         />,
       );
     } else if (ownAccount.id !== account.id && account.relationship?.domain_blocking) {

diff --git a/src/soapbox/features/directory/components/account-card.tsx b/src/soapbox/features/directory/components/account-card.tsx
@@ -32,7 +32,8 @@ const AccountCard: React.FC<IAccountCard> = ({ id }) => {
           <div className='absolute left-2.5 top-2.5'>
             <Badge
               slug='opaque'
-              title={<FormattedMessage id='account.follows_you' defaultMessage='Follows you' />}
+              title='Follows you'
+              id='account-Status--follows-you'
             />
           </div>
         )}

diff --git a/src/soapbox/locales/en.json b/src/soapbox/locales/en.json
@@ -4,7 +4,6 @@
   "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Following",
   "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
   "account.header.alt": "Profile header",
   "account.hide_reblogs": "Hide reposts from @{name}",
   "account.last_status": "Last active",
@@ -15,7 +14,6 @@
   "account.member_since": "Joined {date}",
   "account.mention": "Mention",
   "account.mute": "Mute @{name}",
-  "account.muted": "Muted",
   "account.never_active": "Never",
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts & replies",