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

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

@@ -1,4 +1,5 @@
 {
 {
+  "mailer_setup_required":"<a href='/admin/app'>Email settings</a> are required to send.",
   "admin_top": {
   "admin_top": {
     "management_wiki": "Management Wiki",
     "management_wiki": "Management Wiki",
     "system_information": "System information",
     "system_information": "System information",
@@ -260,7 +261,6 @@
       "description1":"Temporarily issue new users by email addresses.",
       "description1":"Temporarily issue new users by email addresses.",
       "description2":"A temporary password will be generated for the first login.",
       "description2":"A temporary password will be generated for the first login.",
       "invite_thru_email": "Send invitation email",
       "invite_thru_email": "Send invitation email",
-      "mailer_setup_required":"<a href='/admin/app'>Email settings</a> are required to send.",
       "valid_email": "Valid email address is required",
       "valid_email": "Valid email address is required",
       "temporary_password": "The created user has a temporary password",
       "temporary_password": "The created user has a temporary password",
       "send_new_password": "Please send the new password to the user.",
       "send_new_password": "Please send the new password to the user.",

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

@@ -1,4 +1,5 @@
 {
 {
+  "mailer_setup_required":"送信するには <a href='/admin/app'>メールの設定</a> が必要です。",
   "admin_top": {
   "admin_top": {
     "management_wiki": "Wiki管理",
     "management_wiki": "Wiki管理",
     "system_information": "システム情報",
     "system_information": "システム情報",
@@ -258,7 +259,6 @@
       "description1":"メールアドレスを使用して新規ユーザーを仮発行します。",
       "description1":"メールアドレスを使用して新規ユーザーを仮発行します。",
       "description2":"初回のログイン時に使用する仮パスワードが生成されます。",
       "description2":"初回のログイン時に使用する仮パスワードが生成されます。",
       "invite_thru_email": "招待メールを送信する",
       "invite_thru_email": "招待メールを送信する",
-      "mailer_setup_required":"送信するには <a href='/admin/app'>メールの設定</a> が必要です。",
       "valid_email": "メールアドレスを入力してください。",
       "valid_email": "メールアドレスを入力してください。",
       "temporary_password": "作成したユーザーは仮パスワードが設定されています。",
       "temporary_password": "作成したユーザーは仮パスワードが設定されています。",
       "send_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",
       "send_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",

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

@@ -1,4 +1,5 @@
 {
 {
+  "mailer_setup_required":"<a href='/admin/app'>Email settings</a> are required to send.",
 	"admin_top": {
 	"admin_top": {
 		"management_wiki": "管理Wiki",
 		"management_wiki": "管理Wiki",
 		"system_information": "系统信息",
 		"system_information": "系统信息",
@@ -267,9 +268,8 @@
 			"emails": "电子邮件",
 			"emails": "电子邮件",
       "description1":"通过电子邮件地址临时发布新用户。",
       "description1":"通过电子邮件地址临时发布新用户。",
       "description2":"将为首次登录生成一个临时密码。",
       "description2":"将为首次登录生成一个临时密码。",
-			"invite_thru_email": "发送邀请电子邮件",
-      "mailer_setup_required":"<a href='/admin/app'>Email settings</a> are required to send.",
 			"valid_email": "需要有效的电子邮件地址",
 			"valid_email": "需要有效的电子邮件地址",
+			"invite_thru_email": "发送邀请电子邮件",
 			"temporary_password": "创建的用户具有临时密码",
 			"temporary_password": "创建的用户具有临时密码",
 			"send_new_password": "请将新密码发送给用户。",
 			"send_new_password": "请将新密码发送给用户。",
 			"send_temporary_password": "请确保复制此屏幕上的临时密码并将其发送给用户。",
 			"send_temporary_password": "请确保复制此屏幕上的临时密码并将其发送给用户。",

+ 2 - 7
src/client/js/components/Admin/Notification/ManageGlobalNotification.jsx

@@ -183,13 +183,8 @@ class ManageGlobalNotification extends React.Component {
                   </div>
                   </div>
 
 
                   <p className="p-2">
                   <p className="p-2">
-                    {!isMailerSetup && (
-                      <span
-                        className="form-text text-muted"
-                            //  eslint-disable-next-line react/no-danger
-                        dangerouslySetInnerHTML={{ __html: t('admin:user_management.invite_modal.mailer_setup_required') }}
-                      />
-                    )}
+                    {/* eslint-disable-next-line react/no-danger */}
+                    {!isMailerSetup && <span className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:mailer_setup_required') }} />}
                     <b>Hint: </b>
                     <b>Hint: </b>
                     <a href="https://ifttt.com/create" target="blank">{t('notification_setting.email.ifttt_link')}
                     <a href="https://ifttt.com/create" target="blank">{t('notification_setting.email.ifttt_link')}
                       <i className="icon-share-alt" />
                       <i className="icon-share-alt" />

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

@@ -96,10 +96,8 @@ class UserInviteModal extends React.Component {
           <label className="custom-control-label" htmlFor="sendEmail">
           <label className="custom-control-label" htmlFor="sendEmail">
             {t('admin:user_management.invite_modal.invite_thru_email')}
             {t('admin:user_management.invite_modal.invite_thru_email')}
           </label>
           </label>
-          {!isMailerSetup
-            // eslint-disable-next-line react/no-danger
-            && <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:user_management.invite_modal.mailer_setup_required') }} />
-          }
+          {/* eslint-disable-next-line react/no-danger */}
+          {!isMailerSetup && <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:mailer_setup_required') }} />}
         </div>
         </div>
         <div>
         <div>
           <button
           <button