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

Merge pull request #3809 from weseek/fix/GW-6119-fix-accordion-delete-button-wording

fix/gw 6119 fix accordion delete button wording
itizawa 4 лет назад
Родитель
Сommit
935bc2b7f5

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

@@ -301,8 +301,8 @@
     "official_bot_settings": "Official bot Settings",
     "reset": "Reset",
     "reset_all_settings": "Reset all settings",
-    "delete_slackbot_settings": "Reset Slack Bot settings",
-    "slackbot_settings_notice": "Reset",
+    "delete_slackbot_settings": "Delete Slack Bot settings",
+    "slackbot_settings_notice": "Delete",
     "all_settings_of_the_bot_will_be_reset": "All settings of the Bot will be reset.<br>Are you sure?",
     "accordion": {
       "create_bot": "Create Bot",

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

@@ -298,8 +298,8 @@
     "integration_failed":"連携に失敗しました",
     "reset": "リセット",
     "reset_all_settings": "全ての設定をリセット",
-    "delete_slackbot_settings": "Slack Bot 設定をリセットする",
-    "slackbot_settings_notice": "リセットします",
+    "delete_slackbot_settings": "Slack Bot 設定を削除する",
+    "slackbot_settings_notice": "削除します",
     "all_settings_of_the_bot_will_be_reset": "Botの全ての設定がリセットされます。<br>よろしいですか?",
     "accordion": {
       "create_bot": "Bot を作成する",

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

@@ -308,8 +308,8 @@
     "integration_failed":"联动失败",
     "reset":"重置",
     "reset_all_settings": "重置所有设置",
-    "delete_slackbot_settings": "重置 Slack Bot 设置",
-    "slackbot_settings_notice": "重置",
+    "delete_slackbot_settings": "删除 Slack Bot 设置",
+    "slackbot_settings_notice": "删除",
     "all_settings_of_the_bot_will_be_reset": "bot的所有设置将被重置。<br>你确定吗?",
     "accordion": {
       "create_bot": "创建 Bot",

+ 14 - 3
src/client/js/components/Admin/SlackIntegration/DeleteSlackBotSettingsModal.jsx

@@ -35,14 +35,15 @@ const DeleteSlackBotSettingsModal = React.memo((props) => {
     <Modal isOpen={props.isOpen} toggle={closeButtonHandler} className="page-comment-delete-modal">
       <ModalHeader tag="h4" toggle={closeButtonHandler} className="bg-danger text-light">
         <span>
-          <i className="icon-fw icon-fire"></i>
           {props.isResetAll && (
             <>
+              <i className="icon-fw icon-fire" />
               {t('admin:slack_integration.reset_all_settings')}
             </>
           )}
           {!props.isResetAll && (
             <>
+              <i className="icon-trash mr-1" />
               {t('admin:slack_integration.delete_slackbot_settings')}
             </>
           )}
@@ -66,8 +67,18 @@ const DeleteSlackBotSettingsModal = React.memo((props) => {
       <ModalFooter>
         <Button onClick={closeButtonHandler}>{t('Cancel')}</Button>
         <Button color="danger" onClick={deleteSlackCredentialsHandler}>
-          <i className="icon icon-fire"></i>
-          {t('admin:slack_integration.reset')}
+          {props.isResetAll && (
+            <>
+              <i className="icon icon-fire"></i>
+              {t('admin:slack_integration.reset')}
+            </>
+          )}
+          {!props.isResetAll && (
+            <>
+              <i className="icon-trash mr-1" />
+              {t('admin:slack_integration.delete')}
+            </>
+          )}
         </Button>
       </ModalFooter>
     </Modal>