soumaeda 2 лет назад
Родитель
Сommit
7e74618605

+ 1 - 2
apps/app/public/static/locales/en_US/admin.json

@@ -757,8 +757,7 @@
       "password_reset_message": "Let the user know the new password below and strongly recommend to change another one immediately.",
       "send_new_password": "Please send the new password to the user.",
       "target_user": "Target User",
-      "new_password": "New Password",
-      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>Email settings</a>"
+      "new_password": "New Password"
     },
     "external_account": "External Account Management",
     "external_accounts":"External accounts",

+ 1 - 2
apps/app/public/static/locales/ja_JP/admin.json

@@ -765,8 +765,7 @@
       "password_reset_message": "対象ユーザーに下記のパスワードを伝え、すぐに新しく別のパスワードを設定するよう伝えてください。",
       "send_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",
       "target_user": "対象ユーザー",
-      "new_password": "新しいパスワード",
-      "mail_setting_link": "<i class='icon-settings mr-2'></i><a href='/admin/app'>メールの設定</a>"
+      "new_password": "新しいパスワード"
     },
     "external_account": "外部アカウントの管理",
     "external_accounts": "外部アカウント",

+ 1 - 2
apps/app/public/static/locales/zh_CN/admin.json

@@ -765,8 +765,7 @@
       "password_reset_message": "Let the user know the new password below and strongly recommend to change another one immediately.",
       "send_new_password": "Please send the new password to the user.",
       "target_user": "Target User",
-      "new_password": "New Password",
-      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>Email settings</a>"
+      "new_password": "New Password"
     },
     "external_account": "外部账户管理",
     "external_accounts": "外部账户",

+ 3 - 4
apps/app/src/server/routes/apiv3/users.js

@@ -185,7 +185,7 @@ module.exports = (crowi) => {
   const sendEmailByUser = async(user) => {
     const { appService, mailService } = crowi;
     const appTitle = appService.getAppTitle();
-    const failedToSendNewPasswordEmail = { email: user.email, reazon: '' };
+    const failedToSendNewPasswordEmail = { email: user.email, reason: '' };
 
     try {
       await mailService.send({
@@ -202,7 +202,7 @@ module.exports = (crowi) => {
     }
     catch (err) {
       logger.error(err);
-      failedToSendNewPasswordEmail.reazon = err.message;
+      failedToSendNewPasswordEmail.reason = err.message;
     }
 
     return { failedToSendNewPasswordEmail };
@@ -1024,7 +1024,6 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: email and reasons for new password email sending failure
    */
-
   router.put('/reset-password-email', loginRequiredStrictly, adminRequired, addActivity, async(req, res) => {
     const { id } = req.body;
 
@@ -1040,7 +1039,7 @@ module.exports = (crowi) => {
 
       const sendEmail = await sendEmailByUser(userInfo);
 
-      return res.apiv3({ user, failedToSendEmail: sendEmail.failedToSendNewPasswordEmail[0] });
+      return res.apiv3({ user, failedToSendEmail: sendEmail.failedToSendNewPasswordEmail });
     }
     catch (err) {
       logger.error('Error', err);