Yuki Takei 4 лет назад
Родитель
Сommit
0b762e6c80

+ 2 - 1
packages/app/resource/locales/en_US/admin/admin.json

@@ -350,7 +350,8 @@
     }
     }
   },
   },
   "slack_integration_legacy": {
   "slack_integration_legacy": {
-    "alert_deplicated": "This 'Legacy Slack Integration' is outdated and will be discontinued in the future. To use new settings: "
+    "alert_disabled": "This 'Legacy Slack Integration' is currently disabled because <a href='/admin/slack-integration'>the new settings</a> is enabled.",
+    "alert_deplicated": "This 'Legacy Slack Integration' is outdated and will be discontinued in the future. Use <a href='/admin/slack-integration'>the new settings</a> instead. "
   },
   },
   "user_management": {
   "user_management": {
     "invite_users": "Temporarily issue a new user",
     "invite_users": "Temporarily issue a new user",

+ 2 - 1
packages/app/resource/locales/ja_JP/admin/admin.json

@@ -349,7 +349,8 @@
     }
     }
   },
   },
   "slack_integration_legacy": {
   "slack_integration_legacy": {
-    "alert_deplicated": "この 'Slack連携 (レガシー)' は将来廃止されます。新しいSlack連携機能はこちら: "
+    "alert_disabled": "<a href='/admin/slack-integration'>新しい設定</a>が有効になっているため、この 'Slack連携 (レガシー)' は現在無効になっています。",
+    "alert_deplicated": "この 'Slack連携 (レガシー)' は将来廃止されます。代わりに<a href='/admin/slack-integration'>新しいSlack連携機能</a>を利用してください。"
   },
   },
   "user_management": {
   "user_management": {
     "invite_users": "新規ユーザーの仮発行",
     "invite_users": "新規ユーザーの仮発行",

+ 2 - 1
packages/app/resource/locales/zh_CN/admin/admin.json

@@ -359,7 +359,8 @@
     }
     }
   },
   },
   "slack_integration_legacy": {
   "slack_integration_legacy": {
-    "alert_deplicated": "这个 '旧版Slack一体化' 已经过时了,将来会停止使用。要使用新功能: "
+    "alert_disabled": "由于<a href='/admin/slack-integration'>新设置</a>已启用,因此该'旧版Slack一体化'目前已被禁用。",
+    "alert_deplicated": "这个 '旧版Slack一体化' 已经过时了,将来会停止使用。使用<a href='/admin/slack-integration'>新的设置</a>来代替。"
   },
   },
   "user_management": {
   "user_management": {
     "invite_users": "临时发布新用户",
     "invite_users": "临时发布新用户",

+ 8 - 2
packages/app/src/components/Admin/LegacySlackIntegration/LegacySlackIntegration.jsx

@@ -41,10 +41,16 @@ function LegacySlackIntegration(props) {
 
 
   return (
   return (
     <>
     <>
+      <div className="alert alert-danger">
+        <i className="icon-minus icon-fw"></i>
+        {/* eslint-disable-next-line react/no-danger */}
+        <span dangerouslySetInnerHTML={{ __html: t('admin:slack_integration_legacy.alert_disabled') }}></span>
+      </div>
+
       <div className="alert alert-warning">
       <div className="alert alert-warning">
         <i className="icon-info icon-fw"></i>
         <i className="icon-info icon-fw"></i>
-        {t('admin:slack_integration_legacy.alert_deplicated')}
-        <strong><a href="/admin/slack-integration">{t('slack_integration')}</a> <i className="icon-login"></i></strong>
+        {/* eslint-disable-next-line react/no-danger */}
+        <span dangerouslySetInnerHTML={{ __html: t('admin:slack_integration_legacy.alert_deplicated') }}></span>
       </div>
       </div>
 
 
       <SlackConfiguration />
       <SlackConfiguration />