Steven Fukase 4 лет назад
Родитель
Сommit
57705dac48

+ 2 - 0
resource/locales/en_US/admin/admin.json

@@ -299,8 +299,10 @@
       "generate_access_token": "Generate Access Token",
       "register_for_growi_official_bot_proxy_service": "Register for GROWI Official Bot Proxy Service",
       "enter_growi_register_on_slack": "Enter `/growi register` on slack",
+      "paste_growi_url": "Enter `http://localhost:3000` for <b>GROWI URL</b>",
       "enter_access_token_for_growi_and_proxy": "Enter Access Token for GROWI and Access Token for Proxy",
       "set_proxy_url_on_growi": "Set Proxy URL on GROWI",
+      "enter_proxy_url_and_update": "Enter <b>Proxy URL</b> shown on Slack and click Update",
       "select_install_your_app": "Select \"Install your app\".",
       "select_install_to_workspace": "Select \"Install to Workspace\".",
       "register_official_bot_proxy_service": "Issue Access Token / Register GROWI Official Bot Proxy Service",

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

@@ -295,9 +295,9 @@
       "install_now": "今すぐインストール",
       "generate_access_token": "Access Tokenの発行",
       "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上で `/growi register` と打つ",
       "paste_growi_url": "<b>GROWI URL</b>には`http://localhost:3000`を貼り付ける",
-      "enter_access_token_for_growi_and_proxy": "上記で発行した<b>Access Token for GROWI</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に登録する",
       "enter_proxy_url_and_update": "Slack上に通知された<b>Proxy URL</b>を入力し、更新してください。",
       "select_install_your_app": "Install your app をクリックします。",

+ 5 - 3
resource/locales/zh_CN/admin/admin.json

@@ -303,11 +303,13 @@
       "how_to_install": "点击这里查看安装说明",
       "install_bot_to_slack": "将 Bot 安装到 Slack",
       "install_now": "现在安装",
-      "generate_access_token": "Generate Access Token",
-      "register_for_growi_official_bot_proxy_service": "GROWI Official Bot Proxy サービスへの登録",
-      "enter_growi_register_on_slack": "Slack上で`/growi register`と打つ",
+      "generate_access_token": "生成Access Token",
+      "register_for_growi_official_bot_proxy_service": "注册 GROWI Official Bot Proxy Service",
+      "enter_growi_register_on_slack": "在Slack中,输入`/growi register`。",
+      "paste_growi_url": "将`http://localhost:3000`粘贴到 <b>GROWI URL</b> 网址中",
       "enter_access_token_for_growi_and_proxy": "上記で発行した<b>Access Token for GROWI</b> と Access Token for Proxy</b>を入れる",
       "set_proxy_url_on_growi": "ProxyのURLをGROWIに登録する",
+      "enter_proxy_url_and_update": "Slack上に通知された<b>Proxy URL</b>を入力し、更新してください。",
       "select_install_your_app": "选择 \"Install your app\"。",
       "select_install_to_workspace": "选择 \"Install to Workspace\"。",
       "register_official_bot_proxy_service": "发行访问令牌 / 注册 GROWI 官方 Bot 代理服务",

+ 15 - 5
src/client/js/components/Admin/SlackIntegration/CustomBotWithProxySettingsAccordion.jsx

@@ -8,8 +8,6 @@ const CustomBotWithProxySettingsAccordion = () => {
   const [connectionErrorCode, setConnectionErrorCode] = useState(null);
   const [connectionErrorMessage, setConnectionErrorMessage] = useState(null);
   const [connectionSuccessMessage, setConnectionSuccessMessage] = useState(null);
-  // TODO: get url
-  const [url, setUrl] = useState('http://localhost:3000/');
 
   const { t } = useTranslation();
 
@@ -107,14 +105,23 @@ const CustomBotWithProxySettingsAccordion = () => {
           <div className="d-flex flex-column align-items-center">
             <ol className="p-0">
               <li><p className="ml-2">{t('admin:slack_integration.accordion.enter_growi_register_on_slack')}</p></li>
-              {/* TODO: Copy to clipboard on click */}
               <li>
                 <p
                   className="ml-2"
+                  // TODO: Add dynamic link
+                  // TODO: Copy to clipboard on click
+                  // TODO: Add logo
+                  // eslint-disable-next-line react/no-danger
                   dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.accordion.paste_growi_url') }}
                 />
               </li>
-              <li><p className="ml-2">{t('admin:slack_integration.accordion.enter_access_token_for_growi_and_proxy')}</p></li>
+              <li>
+                <p
+                  className="ml-2"
+                  // eslint-disable-next-line react/no-danger
+                  dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.accordion.enter_access_token_for_growi_and_proxy') }}
+                />
+              </li>
             </ol>
             {/* TODO: Insert photo */}
             <div className="rounded border w-50 d-flex justify-content-center align-items-center" style={{ height: '15rem' }}>
@@ -127,7 +134,10 @@ const CustomBotWithProxySettingsAccordion = () => {
         title={<><span className="mr-2">④</span>{t('admin:slack_integration.accordion.set_proxy_url_on_growi')}</>}
       >
         <div className="p-4">
-          <p className="text-center">{t('admin:slack_integration.accordion.enter_proxy_url_and_update')}</p>
+          <p
+            className="text-center"
+            dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.accordion.enter_proxy_url_and_update') }}
+          />
           <div className="form-group row my-4">
             <label className="text-left text-md-right col-md-3 col-form-label">Proxy URL</label>
             <div className="col-md-6">