Shun Miyazawa 4 лет назад
Родитель
Сommit
684cc73fdc

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

@@ -286,7 +286,8 @@
       "remove_admin_access": "Remove admin access",
       "cannot_remove": "You cannot remove yourself from administrator",
       "give_admin_access": "Give admin access",
-      "send_invitation_email": "Send invitation email"
+      "send_invitation_email": "Send invitation email",
+      "resend_invitation_email": "Resend invitation email"
     },
     "reset_password": "Reset Password",
     "reset_password_modal": {

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

@@ -284,7 +284,8 @@
       "remove_admin_access": "管理者から外す",
       "cannot_remove": "自分自身を管理者から外すことはできません",
       "give_admin_access": "管理者にする",
-      "send_invitation_email": "招待メールを送る"
+      "send_invitation_email": "招待メールを送信",
+      "resend_invitation_email": "招待メールを再送信"
     },
     "reset_password": "パスワードのリセット",
     "reset_password_modal": {

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

@@ -294,7 +294,8 @@
 			"remove_admin_access": "删除管理员访问权限",
 			"cannot_remove": "您不能从管理员中删除自己",
 			"give_admin_access": "授予管理员访问权限",
-      "send_invitation_email": "发送邀请邮件"
+      "send_invitation_email": "发送邀请邮件",
+      "resend_invitation_email": "重发邀请函"
 		},
 		"reset_password": "重置密码",
 		"reset_password_modal": {

+ 3 - 1
src/client/js/components/Admin/Users/SendInvitationMailButton.jsx

@@ -45,7 +45,9 @@ const ResendInvitationEmailButton = (props) => {
 
   return (
     <button className="dropdown-item" type="button" onClick={() => { onClickSendInvitationEmailButton() }}>
-      <i className="icon-fw icon-envelope"></i> {t('admin:user_management.user_table.send_invitation_email')}
+      <i className="icon-fw icon-envelope"></i>
+      {user.isInvitationEmailSended && (<>{t('admin:user_management.user_table.resend_invitation_email')}</>)}
+      {!user.isInvitationEmailSended && (<>{t('admin:user_management.user_table.send_invitation_email')}</>)}
     </button>
   );
 };

+ 1 - 1
src/client/js/components/Admin/Users/UserMenu.jsx

@@ -58,7 +58,7 @@ class UserMenu extends React.Component {
         <li>
           {(user.status === 1 || user.status === 3) && <StatusActivateButton user={user} />}
           {user.status === 2 && <StatusSuspendedButton user={user} />}
-          {(user.status === 5 && !user.isInvitationEmailSended) && <SendInvitationEmailButton user={user} />}
+          {user.status === 5 && <SendInvitationEmailButton user={user} />}
           {(user.status === 1 || user.status === 3 || user.status === 5) && <UserRemoveButton user={user} />}
         </li>
       </Fragment>