itizawa 5 лет назад
Родитель
Сommit
36ee4cb392

+ 2 - 1
resource/locales/en_US/translation.json

@@ -341,7 +341,8 @@
     "activate_user_success": "Succeeded to activating {{username}}",
     "activate_user_success": "Succeeded to activating {{username}}",
     "deactivate_user_success": "Succeeded to deactivate {{username}}",
     "deactivate_user_success": "Succeeded to deactivate {{username}}",
     "remove_user_success": "Succeeded to removing {{username}} ",
     "remove_user_success": "Succeeded to removing {{username}} ",
-    "remove_external_user_success": "Succeeded to remove {{accountId}} "
+    "remove_external_user_success": "Succeeded to remove {{accountId}} ",
+    "failed_to_reset_password":"Failed to reset password"
   },
   },
   "template": {
   "template": {
     "modal_label": {
     "modal_label": {

+ 2 - 1
resource/locales/ja_JP/translation.json

@@ -342,7 +342,8 @@
     "activate_user_success": "{{username}}を有効化しました",
     "activate_user_success": "{{username}}を有効化しました",
     "deactivate_user_success": "{{username}}を無効化しました",
     "deactivate_user_success": "{{username}}を無効化しました",
     "remove_user_success": "{{username}}を削除しました",
     "remove_user_success": "{{username}}を削除しました",
-    "remove_external_user_success": "{{accountId}}を削除しました"
+    "remove_external_user_success": "{{accountId}}を削除しました",
+    "failed_to_reset_password":"パスワードのリセットに失敗しました"
   },
   },
   "template": {
   "template": {
     "modal_label": {
     "modal_label": {

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

@@ -339,8 +339,9 @@
 		"activate_user_success": "Succeeded to activating {{username}}",
 		"activate_user_success": "Succeeded to activating {{username}}",
 		"deactivate_user_success": "Succeeded to deactivate {{username}}",
 		"deactivate_user_success": "Succeeded to deactivate {{username}}",
 		"remove_user_success": "Succeeded to removing {{username}} ",
 		"remove_user_success": "Succeeded to removing {{username}} ",
-		"remove_external_user_success": "Succeeded to remove {{accountId}} "
-	},
+    "remove_external_user_success": "Succeeded to remove {{accountId}} ",
+    "failed_to_reset_password":"Failed to reset password"
+  },
 	"template": {
 	"template": {
 		"modal_label": {
 		"modal_label": {
 			"Create/Edit Template Page": "创建/编辑模板页",
 			"Create/Edit Template Page": "创建/编辑模板页",
@@ -721,4 +722,4 @@
 		"complete_to_install2": "完成安装GROWI!请先检查此页上的每个设置。",
 		"complete_to_install2": "完成安装GROWI!请先检查此页上的每个设置。",
 		"failed_to_create_admin_user": "无法创建管理用户。{{errMessage}"
 		"failed_to_create_admin_user": "无法创建管理用户。{{errMessage}"
 	}
 	}
-}
+}

+ 2 - 2
src/client/js/components/Admin/Users/PasswordResetModal.jsx

@@ -23,14 +23,14 @@ class PasswordResetModal extends React.Component {
   }
   }
 
 
   async resetPassword() {
   async resetPassword() {
-    const { appContainer, userForPasswordResetModal } = this.props;
+    const { t, appContainer, userForPasswordResetModal } = this.props;
     try {
     try {
       const res = await appContainer.apiv3Put('/users/reset-password', { id: userForPasswordResetModal._id });
       const res = await appContainer.apiv3Put('/users/reset-password', { id: userForPasswordResetModal._id });
       const { newPassword } = res.data;
       const { newPassword } = res.data;
       this.setState({ temporaryPassword: newPassword, isPasswordResetDone: true });
       this.setState({ temporaryPassword: newPassword, isPasswordResetDone: true });
     }
     }
     catch (err) {
     catch (err) {
-      toastError(err);
+      toastError(err, t('toaster.failed_to_reset_password'));
     }
     }
   }
   }