itizawa 6 лет назад
Родитель
Сommit
5b4f16c241

+ 1 - 0
resource/locales/en-US/translation.json

@@ -598,6 +598,7 @@
     "prioritize_webhook_desc": "Check this option and GROWI use Incoming Webhooks even if Slack App settings are enabled.",
     "prioritize_webhook_desc": "Check this option and GROWI use Incoming Webhooks even if Slack App settings are enabled.",
     "slack_app_configuration": "Slack App Configuration",
     "slack_app_configuration": "Slack App Configuration",
     "slack_app_configuration_desc": "This is the way that compatible with Crowi,<br /> but not recommended in GROWI because it is <strong>too complex</strong>.",
     "slack_app_configuration_desc": "This is the way that compatible with Crowi,<br /> but not recommended in GROWI because it is <strong>too complex</strong>.",
+    "use_instead":"Please use Slack Incoming Webhooks Configuration instead.",
     "how_to": {
     "how_to": {
       "header": "How to configure Incoming Webhooks?",
       "header": "How to configure Incoming Webhooks?",
       "workspace": "(At Workspace) Add a hook",
       "workspace": "(At Workspace) Add a hook",

+ 4 - 3
resource/locales/ja/translation.json

@@ -576,16 +576,17 @@
     "updated_xss": "XSS設定を更新しました"
     "updated_xss": "XSS設定を更新しました"
   },
   },
   "notification_setting": {
   "notification_setting": {
-    "slack_configuration": "Slack Incoming Webhooks 設定",
+    "slack_incoming_configuration": "Slack Incoming Webhooks 設定",
     "prioritize_webhook": "Slack アプリより Webhook を優先する",
     "prioritize_webhook": "Slack アプリより Webhook を優先する",
-    "prioritize_webhook_desc": "このオプションをオンにすると、 Slack App の設定が有効になっていても GROWI は Webhook を使用します。",
+    "prioritize_webhook_desc": "このオプションをオンにすると、 Slack App が有効になっていても GROWI は Webhook を使用します。",
     "slack_app_configuration": "Slack App 設定",
     "slack_app_configuration": "Slack App 設定",
     "slack_app_configuration_desc": "これは Crowiと互換性のある方法です。<br /> しかし、 GROWI では<strong>あまりにも複雑</strong>なのでオススメしません。",
     "slack_app_configuration_desc": "これは Crowiと互換性のある方法です。<br /> しかし、 GROWI では<strong>あまりにも複雑</strong>なのでオススメしません。",
+    "use_instead": "代わりに Slack Incoming Webhooks 設定を使用してください。",
     "how_to": {
     "how_to": {
       "header": "Incoming Webhooks の設定方法",
       "header": "Incoming Webhooks の設定方法",
       "workspace": "ワークスペースで Webhook を追加します。",
       "workspace": "ワークスペースで Webhook を追加します。",
       "workspace_desc1": "<a href='https://slack.com/services/new/incoming-webhook'>Incoming Webhooks Configuration page</a> にアクセスします。",
       "workspace_desc1": "<a href='https://slack.com/services/new/incoming-webhook'>Incoming Webhooks Configuration page</a> にアクセスします。",
-      "workspace_desc2": "投稿するチャンネルを選びます",
+      "workspace_desc2": "投稿するチャンネルを選びます",
       "workspace_desc3": "追加します。",
       "workspace_desc3": "追加します。",
       "at_growi": "GROWI 管理画面で Webhook URL を設定します。",
       "at_growi": "GROWI 管理画面で Webhook URL を設定します。",
       "at_growi_desc": "このページで &rdquo;Webhook URL&rdquo; を入力して送信します。"
       "at_growi_desc": "このページで &rdquo;Webhook URL&rdquo; を入力して送信します。"

+ 2 - 4
src/client/js/components/Admin/Notification/SlackAppConfiguration.jsx

@@ -108,15 +108,13 @@ class SlackAppConfiguration extends React.Component {
                 {/* eslint-disable-next-line react/no-danger */}
                 {/* eslint-disable-next-line react/no-danger */}
                 <span dangerouslySetInnerHTML={{ __html: t('notification_setting.slack_app_configuration_desc') }} />
                 <span dangerouslySetInnerHTML={{ __html: t('notification_setting.slack_app_configuration_desc') }} />
                 <br /><br />
                 <br /><br />
-                Please use{' '}
                 <a
                 <a
                   href="#slack-incoming-webhooks"
                   href="#slack-incoming-webhooks"
                   data-toggle="tab"
                   data-toggle="tab"
                   onClick={() => adminNotificationContainer.switchSlackOption('Incoming Webhooks')}
                   onClick={() => adminNotificationContainer.switchSlackOption('Incoming Webhooks')}
                 >
                 >
-                  {t('notification_setting.slack_incoming_configuration')}
+                  {t('notification_setting.use_instead')}
                 </a>{' '}
                 </a>{' '}
-                instead.
               </div>
               </div>
 
 
               <div className="row mb-5">
               <div className="row mb-5">
@@ -143,7 +141,7 @@ class SlackAppConfiguration extends React.Component {
         <hr />
         <hr />
 
 
         <h3>
         <h3>
-          <i className="icon-question" aria-hidden="true"></i>
+          <i className="icon-question" aria-hidden="true"></i>{' '}
           <a href="#collapseHelpForIwh" data-toggle="collapse">{t('notification_setting.how_to.header')}</a>
           <a href="#collapseHelpForIwh" data-toggle="collapse">{t('notification_setting.how_to.header')}</a>
         </h3>
         </h3>