itizawa hace 6 años
padre
commit
58099cb257

+ 5 - 6
resource/locales/en-US/translation.json

@@ -290,11 +290,11 @@
   "modal_delete": {
   "modal_delete": {
     "delete_page": "Delete Page",
     "delete_page": "Delete Page",
     "deleting_page": "Deleting Page",
     "deleting_page": "Deleting Page",
-    "delete_recursively": "Delete Recursively",
+    "delete_recursively": "Delete child pages under %s recursively.",
     "delete_completely": "Delete Completely",
     "delete_completely": "Delete Completely",
-    "delete_completely_restriction": "You have no admin to delete completely",
-    "recursively": "Delete children of under <code>%s</code> recursively",
-    "completely": "Delete completely instead of putting it into trash"
+    "delete_completely_restriction": "You have no admin to delete completely.",
+    "recursively": "Delete children of under <code>%s</code> recursively.",
+    "completely": "Delete completely instead of putting it into trash."
   },
   },
 
 
   "modal_duplicate": {
   "modal_duplicate": {
@@ -436,7 +436,6 @@
 
 
   "security_setting": {
   "security_setting": {
 		"Basic authentication": "Basic authentication",
 		"Basic authentication": "Basic authentication",
-		"Security settings": "Security settings",
 		"Guest users access": "Guest users access",
 		"Guest users access": "Guest users access",
 		"Register limitation": "Register limitation",
 		"Register limitation": "Register limitation",
 		"The whitelist of registration permission E-mail address": "The whitelist of registration permission E-mail address",
 		"The whitelist of registration permission E-mail address": "The whitelist of registration permission E-mail address",
@@ -455,7 +454,7 @@
     "page_listing_2": "Page listing/searching<br>restricted by User Group",
     "page_listing_2": "Page listing/searching<br>restricted by User Group",
     "page_listing_2_desc": "Show pages that are restricted by User Group when listing/searching",
     "page_listing_2_desc": "Show pages that are restricted by User Group when listing/searching",
     "complete_deletion": "Restrict Complete Deletion of Pages",
     "complete_deletion": "Restrict Complete Deletion of Pages",
-    "complete_deletion_explain": "Restricts users who can completely delete pages to only administrators.",
+    "complete_deletion_explain": "Restricts users who can completely delete pages.",
     "admin_only": "Admin Only",
     "admin_only": "Admin Only",
     "admin_and_author": "Admin and Author",
     "admin_and_author": "Admin and Author",
     "anyone": "Anyone",
     "anyone": "Anyone",

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

@@ -436,7 +436,6 @@
 
 
   "security_setting": {
   "security_setting": {
     "Basic authentication": "Basic認証",
     "Basic authentication": "Basic認証",
-    "Security settings": "セキュリティ設定",
     "Guest users access": "ゲストユーザーのアクセス",
     "Guest users access": "ゲストユーザーのアクセス",
     "Register limitation": "登録の制限",
     "Register limitation": "登録の制限",
     "The whitelist of registration permission E-mail address": "登録許可メールアドレスの<br>ホワイトリスト",
     "The whitelist of registration permission E-mail address": "登録許可メールアドレスの<br>ホワイトリスト",

+ 1 - 1
src/server/views/admin/security.html

@@ -1,6 +1,6 @@
 {% extends '../layout/admin.html' %}
 {% extends '../layout/admin.html' %}
 
 
-{% block html_title %}{{ customTitle(t('Security settings')) }} · {% endblock %}
+{% block html_title %}{{ customTitle(t('security_settings')) }} · {% endblock %}
 
 
 {% block content_header %}
 {% block content_header %}
 <div class="header-wrap">
 <div class="header-wrap">

+ 1 - 1
src/server/views/admin/widget/menu.html

@@ -4,7 +4,7 @@
 <ul class="nav nav-pills nav-stacked">
 <ul class="nav nav-pills nav-stacked">
   <li class="{% if current == 'index'%}active{% endif %}"><a href="/admin"><i class="icon-fw icon-home"></i> {{ t('Management Wiki Home') }}</a></li>
   <li class="{% if current == 'index'%}active{% endif %}"><a href="/admin"><i class="icon-fw icon-home"></i> {{ t('Management Wiki Home') }}</a></li>
   <li class="{% if current == 'app'%}active{% endif %}"><a href="/admin/app"><i class="icon-fw icon-settings"></i> {{ t('App Settings') }}</a></li>
   <li class="{% if current == 'app'%}active{% endif %}"><a href="/admin/app"><i class="icon-fw icon-settings"></i> {{ t('App Settings') }}</a></li>
-  <li class="{% if current == 'security'%}active{% endif %}"><a href="/admin/security"><i class="icon-fw icon-shield"></i> {{ t('Security Settings') }}</a></li>
+  <li class="{% if current == 'security'%}active{% endif %}"><a href="/admin/security"><i class="icon-fw icon-shield"></i> {{ t('security_settings') }}</a></li>
   <li class="{% if current == 'markdown'%}active{% endif %}"><a href="/admin/markdown"><i class="icon-fw icon-note"></i> {{ t('Markdown Settings') }}</a></li>
   <li class="{% if current == 'markdown'%}active{% endif %}"><a href="/admin/markdown"><i class="icon-fw icon-note"></i> {{ t('Markdown Settings') }}</a></li>
   <li class="{% if current == 'customize'%}active{% endif %}"><a href="/admin/customize"><i class="icon-fw icon-wrench"></i> {{ t('Customize') }}</a></li>
   <li class="{% if current == 'customize'%}active{% endif %}"><a href="/admin/customize"><i class="icon-fw icon-wrench"></i> {{ t('Customize') }}</a></li>
   <li class="{% if current == 'importer'%}active{% endif %}"><a href="/admin/importer"><i class="icon-fw icon-cloud-download"></i> {{ t('Import Data') }}</a></li>
   <li class="{% if current == 'importer'%}active{% endif %}"><a href="/admin/importer"><i class="icon-fw icon-cloud-download"></i> {{ t('Import Data') }}</a></li>

+ 2 - 2
src/server/views/widget/alert_breaking_changes.html

@@ -3,13 +3,13 @@
 {% if getConfig('crowi', 'security:isEnabledPassport') !== true %}
 {% if getConfig('crowi', 'security:isEnabledPassport') !== true %}
 <div class="myadmin-alert alert alert-warning mb-0">
 <div class="myadmin-alert alert alert-warning mb-0">
   <i class="icon-exclamation"></i>
   <i class="icon-exclamation"></i>
-  {{ t("breaking_changes.v346_passport_is_not_enabled", '<a href="/admin/security">' + t('Security settings') + '<i class="icon-login"></i></a>') }}
+  {{ t("breaking_changes.v346_passport_is_not_enabled", '<a href="/admin/security">' + t('security_settings') + '<i class="icon-login"></i></a>') }}
 </div>
 </div>
 {% endif %}
 {% endif %}
 
 
 {% if getConfig('crowi', 'security:basicName') || getConfig('crowi', 'security:basicSecret') %}
 {% if getConfig('crowi', 'security:basicName') || getConfig('crowi', 'security:basicSecret') %}
 <div class="myadmin-alert alert alert-warning mb-0">
 <div class="myadmin-alert alert alert-warning mb-0">
   <i class="icon-exclamation"></i>
   <i class="icon-exclamation"></i>
-  {{ t("breaking_changes.v346_using_basic_auth", '<a href="/admin/security">' + t('Security settings') + '<i class="icon-login"></i></a>') }}
+  {{ t("breaking_changes.v346_using_basic_auth", '<a href="/admin/security">' + t('security_settings') + '<i class="icon-login"></i></a>') }}
 </div>
 </div>
 {% endif %}
 {% endif %}