Просмотр исходного кода

Merge pull request #3772 from weseek/imprv/gw6038-growi-register-description

Imprv/gw6038 growi register description
itizawa 4 лет назад
Родитель
Сommit
5cbcc4b8e4

+ 1 - 1
resource/locales/en_US/admin/admin.json

@@ -310,7 +310,7 @@
       "install_now": "Install now",
       "install_now": "Install now",
       "generate_access_token": "Generate Access Token",
       "generate_access_token": "Generate Access Token",
       "register_for_growi_official_bot_proxy_service": "Register for GROWI Official Bot Proxy Service",
       "register_for_growi_official_bot_proxy_service": "Register for GROWI Official Bot Proxy Service",
-      "enter_growi_register_on_slack": "Enter `/growi register` on slack",
+      "enter_growi_register_on_slack": "Enter <b>/growi register</b> on slack",
       "paste_growi_url": "Since a modal is displayed, enter the following URL in <b>GROWI URL</b>.",
       "paste_growi_url": "Since a modal is displayed, enter the following URL in <b>GROWI URL</b>.",
       "enter_access_token_for_growi_and_proxy": "Enter <b>Access Token for GROWI</b> and <b>Access Token for Proxy</b>",
       "enter_access_token_for_growi_and_proxy": "Enter <b>Access Token for GROWI</b> and <b>Access Token for Proxy</b>",
       "set_proxy_url_on_growi": "Set Proxy URL on GROWI",
       "set_proxy_url_on_growi": "Set Proxy URL on GROWI",

+ 1 - 1
resource/locales/ja_JP/admin/admin.json

@@ -307,7 +307,7 @@
       "install_now": "今すぐインストール",
       "install_now": "今すぐインストール",
       "generate_access_token": "Access Tokenの発行",
       "generate_access_token": "Access Tokenの発行",
       "register_for_growi_official_bot_proxy_service": "GROWI Official Bot Proxy サービスへの登録",
       "register_for_growi_official_bot_proxy_service": "GROWI Official Bot Proxy サービスへの登録",
-      "enter_growi_register_on_slack": "Slack上で `/growi register` と打つ",
+      "enter_growi_register_on_slack": "Slack上で <b>/growi register</b> と打ちます。",
       "paste_growi_url": "モーダルが表示されるので、<b>GROWI URL</b> には下記のURLを入力します。",
       "paste_growi_url": "モーダルが表示されるので、<b>GROWI URL</b> には下記のURLを入力します。",
       "enter_access_token_for_growi_and_proxy": "上記で発行した<b>Access Token for GROWI</b> と <b>Access Token for Proxy</b>を入れる",
       "enter_access_token_for_growi_and_proxy": "上記で発行した<b>Access Token for GROWI</b> と <b>Access Token for Proxy</b>を入れる",
       "set_proxy_url_on_growi": "ProxyのURLをGROWIに登録する",
       "set_proxy_url_on_growi": "ProxyのURLをGROWIに登録する",

+ 1 - 1
resource/locales/zh_CN/admin/admin.json

@@ -317,7 +317,7 @@
       "install_now": "现在安装",
       "install_now": "现在安装",
       "generate_access_token": "生成Access Token",
       "generate_access_token": "生成Access Token",
       "register_for_growi_official_bot_proxy_service": "注册 GROWI Official Bot Proxy Service",
       "register_for_growi_official_bot_proxy_service": "注册 GROWI Official Bot Proxy Service",
-      "enter_growi_register_on_slack": "在Slack中,输入`/growi register`。",
+      "enter_growi_register_on_slack": "在Slack中,输入 <b>/growi register</b>",
       "paste_growi_url": "由于显示了模式,请在 <b>GROWI URL</b> 中输入以下URL",
       "paste_growi_url": "由于显示了模式,请在 <b>GROWI URL</b> 中输入以下URL",
       "enter_access_token_for_growi_and_proxy": "插入上面发出的 <b>Access Token for GROWI</b> 和 <b>Access Token for Proxy</b>。",
       "enter_access_token_for_growi_and_proxy": "插入上面发出的 <b>Access Token for GROWI</b> 和 <b>Access Token for Proxy</b>。",
       "set_proxy_url_on_growi": "向GROWI注册Proxy的URL",
       "set_proxy_url_on_growi": "向GROWI注册Proxy的URL",

+ 7 - 2
src/client/js/components/Admin/SlackIntegration/WithProxyAccordions.jsx

@@ -114,12 +114,17 @@ export const GenelatingTokensAndRegisteringProxyServiceProcess = withUnstatedCon
       <p className="font-weight-bold">2. {t('admin:slack_integration.accordion.register_for_growi_official_bot_proxy_service')}</p>
       <p className="font-weight-bold">2. {t('admin:slack_integration.accordion.register_for_growi_official_bot_proxy_service')}</p>
       <div className="d-flex flex-column align-items-center">
       <div className="d-flex flex-column align-items-center">
         <ol className="p-0">
         <ol className="p-0">
-          <li><p className="ml-2">{t('admin:slack_integration.accordion.enter_growi_register_on_slack')}</p></li>
+          <li>
+            <p
+              className="ml-2"
+                // eslint-disable-next-line react/no-danger
+              dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.accordion.enter_growi_register_on_slack') }}
+            />
+          </li>
           <li>
           <li>
             <p
             <p
               className="ml-2"
               className="ml-2"
                 // TODO: Add dynamic link
                 // TODO: Add dynamic link
-                // TODO: Copy to clipboard on click
                 // TODO: Add logo
                 // TODO: Add logo
                 // eslint-disable-next-line react/no-danger
                 // eslint-disable-next-line react/no-danger
               dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.accordion.paste_growi_url') }}
               dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.accordion.paste_growi_url') }}