Merge pull request #1540 from weseek/reactify-admin/external-user-management

i18n

resource/locales/en-US/admin/user_management.json

@@ -29,10 +29,10 @@
     "target_user": "Target User",
     "new_password": "New Password"
   },
-  "invite": "Invite",
-  "invited": "User was invited",
   "external_account": "External Account Management",
   "external_account_list": "External Account List",
+  "invite": "Invite",
+  "invited": "User was invited",
   "back_to_user_management": "Back to User Management",
   "authentication_provider": "Authentication Provider",
   "manage": "Manage",

resource/locales/ja/admin/user_management.json

@@ -30,9 +30,9 @@
     "new_password": "新しいパスワード"
   },
   "external_account": "外部アカウントの管理",
+  "external_account_list": "外部アカウント一覧",
   "invite": "招待する",
   "invited": "ユーザーを招待しました",
-  "external_account_list": "外部アカウント一覧",
   "back_to_user_management": "ユーザー管理に戻る",
   "authentication_provider": "認証情報プロバイダ",
   "manage": "操作",

src/client/js/components/Admin/ManageExternalAccount.jsx

@@ -50,15 +50,15 @@ class ManageExternalAccount extends React.Component {
         <p>
           <a className="btn btn-default" href="/admin/users">
             <i className="icon-fw ti-arrow-left" aria-hidden="true"></i>
-            { t('user_management.back_to_user_management') }
+            {t('user_management:back_to_user_management')}
           </a>
         </p>
 
-        <h2>{ t('user_management.external_account_list') }</h2>
+        <h2>{t('user_management:external_account_list')}</h2>
 
-        { pager }
+        {pager}
         <ExternalAccountTable />
-        { pager }
+        {pager}
 
       </Fragment>
     );

src/client/js/components/Admin/Users/ExternalAccountTable.jsx

@@ -26,7 +26,7 @@ class ExternalAccountTable extends React.Component {
 
     try {
       const accountId = await this.props.adminExternalAccountsContainer.removeExternalAccountById(externalAccountId);
-      toastSuccess(t('user_management.remove_external_user_success', { accountId }));
+      toastSuccess(t('toaster:remove_external_user_success', { accountId }));
     }
     catch (err) {
       toastError(err);
@@ -41,11 +41,11 @@ class ExternalAccountTable extends React.Component {
         <table className="table table-bordered table-user-list">
           <thead>
             <tr>
-              <th width="120px">{ t('user_management.authentication_provider') }</th>
+              <th width="120px">{t('user_management:authentication_provider')}</th>
               <th><code>accountId</code></th>
-              <th>{ t('user_management.related_username') }<code>username</code></th>
+              <th>{t('user_management:related_username')}<code>username</code></th>
               <th>
-                { t('user_management.password_setting') }
+                {t('user_management:password_setting')}
                 <div
                   className="text-muted"
                   data-toggle="popover"
@@ -55,14 +55,14 @@ class ExternalAccountTable extends React.Component {
                   role="button"
                   data-animation="false"
                   data-html="true"
-                  data-content={t('user_management.password_setting_help')}
+                  data-content={t('user_management:password_setting_help')}
                 >
                   <small>
                     <i className="icon-question" aria-hidden="true"></i>
                   </small>
                 </div>
               </th>
-              <th width="100px">{ t('Created') }</th>
+              <th width="100px">{t('Created')}</th>
               <th width="70px"></th>
             </tr>
           </thead>
@@ -75,18 +75,18 @@ class ExternalAccountTable extends React.Component {
                     <strong>{ea.accountId}</strong>
                   </td>
                   <td>
-                    <strong>{ ea.user.username }</strong>
+                    <strong>{ea.user.username}</strong>
                   </td>
                   <td>
-                    { ea.user.password
+                    {ea.user.password
                       ? (
                         <span className="label label-info">
-                          { t('user_management.set') }
+                          {t('user_management:set')}
                         </span>
                       )
                       : (
                         <span className="label label-warning">
-                          { t('user_management.unset') }
+                          {t('user_management:unset')}
                         </span>
                       )
                     }
@@ -98,10 +98,10 @@ class ExternalAccountTable extends React.Component {
                         <i className="icon-settings"></i> <span className="caret"></span>
                       </button>
                       <ul className="dropdown-menu" role="menu">
-                        <li className="dropdown-header">{ t('user_management.edit_menu') }</li>
+                        <li className="dropdown-header">{t('user_management:user_table.edit_menu')}</li>
                         <li>
                           <a onClick={() => { return this.removeExtenalAccount(ea._id) }}>
-                            <i className="icon-fw icon-fire text-danger"></i> { t('Delete') }
+                            <i className="icon-fw icon-fire text-danger"></i> {t('Delete')}
                           </a>
                         </li>
                       </ul>