mizozobu 7 лет назад
Родитель
Сommit
7905ed83b9

+ 7 - 0
resource/locales/en-US/translation.json

@@ -14,6 +14,7 @@
   "New": "New",
   "New": "New",
   "Shortcuts": "Shortcuts",
   "Shortcuts": "Shortcuts",
   "eg": "e.g.",
   "eg": "e.g.",
+  "Undo": "Undo",
 
 
   "Update": "Update",
   "Update": "Update",
   "Update Page": "Update Page",
   "Update Page": "Update Page",
@@ -590,6 +591,11 @@
   "user_management": {
   "user_management": {
     "User management": "User management",
     "User management": "User management",
     "invite_users": "Invite new users",
     "invite_users": "Invite new users",
+    "emails": "Emails",
+    "invite_thru_email": "Send Invitation Email",
+    "invite": "Invite",
+    "give_admin_access": "Give admin access",
+    "remove_admin_access": "Remove admin access",
     "external_account": "External account management",
     "external_account": "External account management",
     "user_list": "List of users",
     "user_list": "List of users",
     "external_account_list": "External Account List",
     "external_account_list": "External Account List",
@@ -606,6 +612,7 @@
     "Reissue password": "Reissue password",
     "Reissue password": "Reissue password",
     "related_username": "Related user's <code>%s</code>",
     "related_username": "Related user's <code>%s</code>",
     "Status":"Status",
     "Status":"Status",
+    "accept": "Accept",
     "Deactivate account":"Deactivate account",
     "Deactivate account":"Deactivate account",
     "your_own":"You cannot deactivate your own account",
     "your_own":"You cannot deactivate your own account",
     "Administrator menu":"Administrator menu",
     "Administrator menu":"Administrator menu",

+ 7 - 0
resource/locales/ja/translation.json

@@ -14,6 +14,7 @@
   "New": "作成",
   "New": "作成",
   "Shortcuts": "ショートカット",
   "Shortcuts": "ショートカット",
   "eg": "例:",
   "eg": "例:",
+  "Undo": "元に戻す",
 
 
   "Update": "更新",
   "Update": "更新",
   "Update Page": "ページを更新",
   "Update Page": "ページを更新",
@@ -602,6 +603,11 @@
   "user_management": {
   "user_management": {
     "User management": "ユーザー管理",
     "User management": "ユーザー管理",
     "invite_users": "新規ユーザーの招待",
     "invite_users": "新規ユーザーの招待",
+    "emails": "メールアドレス (複数行入力で複数人招待可能)",
+    "invite_thru_email": "招待をメールで送信",
+    "invite": "招待する",
+    "give_admin_access": "管理者にする",
+    "remove_admin_access": "管理者から外す",
     "external_account": "外部アカウントの管理",
     "external_account": "外部アカウントの管理",
     "user_list": "ユーザー一覧",
     "user_list": "ユーザー一覧",
     "external_account_list": "外部アカウント一覧",
     "external_account_list": "外部アカウント一覧",
@@ -618,6 +624,7 @@
     "Reissue password": "パスワードの再発行",
     "Reissue password": "パスワードの再発行",
     "related_username": "関連付けられているユーザーの <code>%s</code>",
     "related_username": "関連付けられているユーザーの <code>%s</code>",
     "Status": "ステータス",
     "Status": "ステータス",
+    "accept": "承認する",
     "Deactivate account": "アカウント停止",
     "Deactivate account": "アカウント停止",
     "your_own": "自分自身のアカウントを停止することはできません",
     "your_own": "自分自身のアカウントを停止することはできません",
     "Administrator menu": "管理者メニュー",
     "Administrator menu": "管理者メニュー",

+ 12 - 12
src/server/views/admin/users.html

@@ -44,14 +44,14 @@
       <form role="form" action="/admin/user/invite" method="post">
       <form role="form" action="/admin/user/invite" method="post">
         <div id="inviteUserForm" class="collapse">
         <div id="inviteUserForm" class="collapse">
           <div class="form-group">
           <div class="form-group">
-            <label for="inviteForm[emailList]">メールアドレス (複数行入力で複数人招待可能)</label>
-            <textarea class="form-control" name="inviteForm[emailList]" placeholder="例: user@growi.org"></textarea>
+            <label for="inviteForm[emailList]">{{ t('user_management.emails') }}</label>
+            <textarea class="form-control" name="inviteForm[emailList]" placeholder="{{ t('eg') }} user@growi.org"></textarea>
           </div>
           </div>
           <div class="checkbox checkbox-info">
           <div class="checkbox checkbox-info">
             <input type="checkbox" id="inviteWithEmail" name="inviteForm[sendEmail]" checked>
             <input type="checkbox" id="inviteWithEmail" name="inviteForm[sendEmail]" checked>
-            <label for="inviteWithEmail">招待をメールで送信</label>
+            <label for="inviteWithEmail">{{ t('user_management.invite_thru_email') }}</label>
           </div>
           </div>
-          <button type="submit" class="btn btn-primary">招待する</button>
+          <button type="submit" class="btn btn-primary">{{ t('user_management.invite') }}</button>
         </div>
         </div>
         <input type="hidden" name="_csrf" value="{{ csrf() }}">
         <input type="hidden" name="_csrf" value="{{ csrf() }}">
       </form>
       </form>
@@ -150,7 +150,7 @@
         <thead>
         <thead>
           <tr>
           <tr>
             <th width="100px">#</th>
             <th width="100px">#</th>
-            <th>Status</th>
+            <th>{{ t('user_management.Status') }}</th>
             <th><code>username</code></th>
             <th><code>username</code></th>
             <th>{{ t('Name') }}</th>
             <th>{{ t('Name') }}</th>
             <th>{{ t('Email') }}</th>
             <th>{{ t('Email') }}</th>
@@ -213,7 +213,7 @@
                   </form>
                   </form>
                   <li>
                   <li>
                     <a href="javascript:form_activate_{{ sUserId }}.submit()">
                     <a href="javascript:form_activate_{{ sUserId }}.submit()">
-                      <i class="icon-fw icon-user-following"></i> 承認する
+                      <i class="icon-fw icon-user-following"></i> {{ t('user_management.accept') }}
                     </a>
                     </a>
                   </li>
                   </li>
                   {% endif  %}
                   {% endif  %}
@@ -247,13 +247,13 @@
                   </form>
                   </form>
                   <li>
                   <li>
                     <a href="javascript:form_activate_{{ sUserId }}.submit()">
                     <a href="javascript:form_activate_{{ sUserId }}.submit()">
-                      <i class="icon-fw icon-action-redo"></i> 元に戻す
+                      <i class="icon-fw icon-action-redo"></i> {{ t('Undo') }}
                     </a>
                     </a>
                   </li>
                   </li>
                   <li>
                   <li>
                     {# label は同じだけど、こっちは論理削除 #}
                     {# label は同じだけど、こっちは論理削除 #}
                     <a href="javascript:form_remove_{{ sUserId }}.submit()">
                     <a href="javascript:form_remove_{{ sUserId }}.submit()">
-                      <i class="icon-fw icon-fire text-danger"></i> 削除する
+                      <i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}
                     </a>
                     </a>
                   </li>
                   </li>
                   {% endif  %}
                   {% endif  %}
@@ -265,7 +265,7 @@
                   <li class="dropdown-button">
                   <li class="dropdown-button">
                     {# label は同じだけど、こっちは物理削除 #}
                     {# label は同じだけど、こっちは物理削除 #}
                     <a href="javascript:form_removeCompletely_{{ sUserId }}.submit()">
                     <a href="javascript:form_removeCompletely_{{ sUserId }}.submit()">
-                      <i class="icon-fw icon-fire text-danger"></i> 削除する
+                      <i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}
                     </a>
                     </a>
                   </li>
                   </li>
                   {% endif  %}
                   {% endif  %}
@@ -281,11 +281,11 @@
                   <li>
                   <li>
                     {% if sUser.username != user.username %}
                     {% if sUser.username != user.username %}
                       <a href="javascript:form_removeFromAdmin_{{ sUserId }}.submit()">
                       <a href="javascript:form_removeFromAdmin_{{ sUserId }}.submit()">
-                        <i class="icon-fw icon-user-unfollow"></i> 管理者からはずす
+                        <i class="icon-fw icon-user-unfollow"></i> {{ t("user_management.remove_admin_access") }}
                       </a>
                       </a>
                     {% else %}
                     {% else %}
                       <a disabled>
                       <a disabled>
-                        <i class="icon-fw icon-user-unfollow"></i> 管理者からはずす
+                        <i class="icon-fw icon-user-unfollow"></i> {{ t("user_management.remove_admin_access") }}
                       </a>
                       </a>
                       <p class="alert alert-danger m-l-10 m-r-10 p-10">{{ t("user_management.cannot_remove") }}</p>
                       <p class="alert alert-danger m-l-10 m-r-10 p-10">{{ t("user_management.cannot_remove") }}</p>
                     {% endif %}
                     {% endif %}
@@ -296,7 +296,7 @@
                   </form>
                   </form>
                   <li>
                   <li>
                     <a href="javascript:form_makeAdmin_{{ sUserId }}.submit()">
                     <a href="javascript:form_makeAdmin_{{ sUserId }}.submit()">
-                      <i class="icon-fw icon-magic-wand"></i> 管理者にする
+                      <i class="icon-fw icon-magic-wand"></i> {{ t("user_management.give_admin_access") }}
                     </a>
                     </a>
                   </li>
                   </li>
                   {% endif %}
                   {% endif %}