Merge pull request #4912 from thematters/fix/copy-label

thematters · Oct 28, 2024 · e9beb66 · e9beb66
2 parents dca5614 + 2c6a465
commit e9beb66
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 27 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -1344,9 +1344,6 @@
     "defaultMessage": "Topics",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
-  },
   "KlJEP9": {
     "defaultMessage": "Wallet connected",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1737,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "Firebolt"
   },
+  "RkyEBL": {
+    "defaultMessage": "Featured",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} articles"
   },
@@ -2772,6 +2773,9 @@
     "defaultMessage": "Last step: Set Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
+  },
   "l2eEyp": {
     "defaultMessage": "Transaction Password successfully changed."
   },

diff --git a/lang/en.json b/lang/en.json
@@ -1344,9 +1344,6 @@
     "defaultMessage": "Topics",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
-  },
   "KlJEP9": {
     "defaultMessage": "Wallet connected",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1737,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "Firebolt"
   },
+  "RkyEBL": {
+    "defaultMessage": "Featured",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} articles"
   },
@@ -2772,6 +2773,9 @@
     "defaultMessage": "Last step: Set Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
+  },
   "l2eEyp": {
     "defaultMessage": "Transaction Password successfully changed."
   },

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -1344,9 +1344,6 @@
     "defaultMessage": "标签",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "现在报名，写作之旅将于数天后开始，活动细则可查看公告。（报名确认通常需要几分钟审核时间，之后你的头像将出现在作者之中）"
-  },
   "KlJEP9": {
     "defaultMessage": "钱包已绑定",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1737,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "火闪电"
   },
+  "RkyEBL": {
+    "defaultMessage": "精华",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} 篇文章"
   },
@@ -2175,7 +2176,7 @@
     "defaultMessage": "作品管理"
   },
   "ZN1IzT": {
-    "defaultMessage": "从自由写精选中移除"
+    "defaultMessage": "从自由写精华中移除"
   },
   "ZNK0I9": {
     "defaultMessage": "喜欢你的评论"
@@ -2679,7 +2680,7 @@
     "description": "type:apply"
   },
   "jXDxa6": {
-    "defaultMessage": "作品已从自由写精选中移除"
+    "defaultMessage": "作品已从自由写精华中移除"
   },
   "jiB0Z2": {
     "defaultMessage": "无法绑定钱包",
@@ -2772,6 +2773,9 @@
     "defaultMessage": "最后一步：设置 Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "现在报名，写作之旅将于数天后开始，活动细则可查看公告。"
+  },
   "l2eEyp": {
     "defaultMessage": "交易密码重置成功"
   },

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -441,7 +441,7 @@
     "description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
   },
   "5SgH7l": {
-    "defaultMessage": "作品已添加至自由寫精選"
+    "defaultMessage": "作品已添加至自由寫精華"
   },
   "5UglrB": {
     "defaultMessage": "送出成功"
@@ -1344,9 +1344,6 @@
     "defaultMessage": "標籤",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "現在報名，寫作之旅將於數天後開始，活動細則可查看公告。（報名確認通常需要幾分鐘審核時間，之後你的頭像將出現在作者之中）"
-  },
   "KlJEP9": {
     "defaultMessage": "錢包已綁定",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1663,7 +1660,7 @@
     "defaultMessage": "描述"
   },
   "QFCfA7": {
-    "defaultMessage": "添加到自由寫精選"
+    "defaultMessage": "添加到自由寫精華"
   },
   "QQSdHP": {
     "defaultMessage": "查看更多"
@@ -1737,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "火閃電"
   },
+  "RkyEBL": {
+    "defaultMessage": "精華",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} 篇文章"
   },
@@ -2175,7 +2176,7 @@
     "defaultMessage": "作品管理"
   },
   "ZN1IzT": {
-    "defaultMessage": "从自由寫精選中移除"
+    "defaultMessage": "从自由寫精華中移除"
   },
   "ZNK0I9": {
     "defaultMessage": "喜歡你的評論"
@@ -2679,7 +2680,7 @@
     "description": "type:apply"
   },
   "jXDxa6": {
-    "defaultMessage": "作品已從自由寫精選中移除"
+    "defaultMessage": "作品已從自由寫精華中移除"
   },
   "jiB0Z2": {
     "defaultMessage": "無法綁定錢包",
@@ -2772,6 +2773,9 @@
     "defaultMessage": "最後一步：設置 Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
+  },
   "l2eEyp": {
     "defaultMessage": "交易密碼重置成功"
   },

diff --git a/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Button.tsx b/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Button.tsx
@@ -65,7 +65,7 @@ const RecommendArticleButton: React.FC<RecommendArticleButtonProps> = ({
       : article.oss.inRecommendHottest && article.oss.inRecommendNewest
 
   const texts = {
-    icymi: ['選為精華', '撤銷精華'],
+    icymi: ['設為首頁精選', '撤銷首頁精選'],
     hottestAndNewest: ['撤銷移出', '移出熱門與最新'],
   }
   const icons = {

diff --git a/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Dialog.tsx b/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Dialog.tsx
@@ -53,13 +53,13 @@ const ToggleRecommendArticleDialog = ({
     useMutation<ToggleRecommendArticleMutation>(TOGGLE_RECOMMEND_ARTICLE)
 
   const title = {
-    icymi: ['選為精華', '撤銷精華'],
+    icymi: ['設為首頁精選', '撤銷首頁精選'],
     hottestAndNewest: ['撤銷移出', '移出熱門與最新'],
   }
   const description = {
     icymi: [
-      `確認要将「<span class="u-highlight">${article.title}</span>」選為精華嗎？`,
-      `確認要将「<span class="u-highlight">${article.title}</span>」撤銷精華嗎？`,
+      `確認要将「<span class="u-highlight">${article.title}</span>」設為首頁精選嗎？`,
+      `確認要将「<span class="u-highlight">${article.title}</span>」撤銷首頁精選嗎？`,
     ],
     hottestAndNewest: [
       `作品「<span class="u-highlight">${article.title}</span>」將可能出現在熱門和最新的文章列表中。`,

diff --git a/src/views/CampaignDetail/Apply/Dialog/index.tsx b/src/views/CampaignDetail/Apply/Dialog/index.tsx
@@ -82,8 +82,8 @@ const ApplyCampaignDialog = ({
             <p>
               {isInApplicationPeriod ? (
                 <FormattedMessage
-                  defaultMessage="Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
-                  id="KkHQZ+"
+                  defaultMessage="Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. "
+                  id="l0tvVM"
                 />
               ) : (
                 <FormattedMessage

diff --git a/src/views/CampaignDetail/ArticleFeeds/MainFeed/index.tsx b/src/views/CampaignDetail/ArticleFeeds/MainFeed/index.tsx
@@ -212,7 +212,7 @@ const MainFeed = ({ feedType, camapign }: MainFeedProps) => {
             <ArticleDigestFeed
               article={node}
               label={
-                isAll && (
+                (isAll || isFeatured) && (
                   <>
                     <span
                       className={[
@@ -223,7 +223,7 @@ const MainFeed = ({ feedType, camapign }: MainFeedProps) => {
                       {getArticleStageName(node, lang)}
                     </span>
 
-                    {featured && (
+                    {isAll && featured && (
                       <TextIcon
                         icon={
                           <Icon

diff --git a/src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx b/src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx
@@ -74,7 +74,9 @@ const ArticleFeedsTabs = ({
             }}
             title={intl.formatMessage({
               defaultMessage: 'Featured',
-              id: 'CnPG8j',
+              id: 'RkyEBL',
+              description:
+                'src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx',
             })}
             theme="green"
           />