فهرست منبع

add Active Directory settings example

Yuki Takei 7 سال پیش
والد
کامیت
f80ae98184
3فایلهای تغییر یافته به همراه7 افزوده شده و 4 حذف شده
  1. 2 1
      lib/locales/en-US/translation.json
  2. 2 1
      lib/locales/ja/translation.json
  3. 3 2
      lib/views/admin/widget/passport/ldap.html

+ 2 - 1
lib/locales/en-US/translation.json

@@ -326,7 +326,8 @@
       "search_filter_detail1": "The query used to locate the authenticated user.",
       "search_filter_detail2": "Use <code>&#123;&#123;username&#125;&#125;</code> to reference the username entered in the login page.",
       "search_filter_detail3": "If empty, the filter <code>(uid=&#123;&#123;username&#125;&#125;)</code> is used.",
-      "search_filter_example": "Example to match with 'uid' or 'mail'",
+      "search_filter_example1": "Match with 'uid' or 'mail'",
+      "search_filter_example2": "Match with 'sAMAccountName' for Active Directory",
       "username_detail": "Specification of mappings when creating new users",
       "Treat username matching as identical": "Automatically bind external accounts newly logged in to local accounts when <code>username</code> match",
   		"Treat username matching as identical_warn": "WARNING: Be aware of security because the system treats the same user as a match of <code>username</code>.",

+ 2 - 1
lib/locales/ja/translation.json

@@ -345,7 +345,8 @@
       "search_filter_detail1": "認証されるユーザーを一意に決定するための LDAP フィルタ",
       "search_filter_detail2": "ログイン時のユーザー名を使用するには <code>&#123;&#123;username&#125;&#125;</code> の形式を使用してください。",
       "search_filter_detail3": "空欄の場合 <code>(uid=&#123;&#123;username&#125;&#125;)</code> が使用されます。",
-      "search_filter_example": "'uid' または 'mail' に一致させる場合の例",
+      "search_filter_example1": "'uid' または 'mail' に一致",
+      "search_filter_example2": "'sAMAccountName' に一致 (Active Directory)",
       "username_detail": "新規ユーザーの関連付けを設定",
       "Treat username matching as identical": "新規ログイン時、<code>username</code> が一致したローカルアカウントが存在した場合は自動的に紐付ける",
       "Treat username matching as identical_warn": "WARNING: <code>username</code> の一致を以て同一ユーザーであるとみなすので、セキュリティに注意してください",

+ 3 - 2
lib/views/admin/widget/passport/ldap.html

@@ -108,9 +108,10 @@
               {{ t("security_setting.ldap.search_filter_detail3") }}
             </small>
           </p>
-          <p>
+          <p class="help-block">
             <small>
-              {{ t("security_setting.ldap.search_filter_example") }}: <code>(|(uid={% raw %}{{username}}{% endraw %})(mail={% raw %}{{username}}{% endraw %}))</code>
+              {{ t("security_setting.example") }}1 - {{ t("security_setting.ldap.search_filter_example1") }}: <code>(|(uid={% raw %}{{username}}{% endraw %})(mail={% raw %}{{username}}{% endraw %}))</code><br>
+              {{ t("security_setting.example") }}2 - {{ t("security_setting.ldap.search_filter_example2") }}: <code>(sAMAccountName={% raw %}{{username}}{% endraw %})</code>
             </small>
           </p>
         </div>