diff --git a/plugins/baser-core/resources/locales/baser_core.pot b/plugins/baser-core/resources/locales/baser_core.pot index f616a79745..024ced3b09 100644 --- a/plugins/baser-core/resources/locales/baser_core.pot +++ b/plugins/baser-core/resources/locales/baser_core.pot @@ -4566,6 +4566,16 @@ msgstr "" msgid "半角英数字(英字は大文字小文字を区別)とスペース、記号(._-:/()#,@[]+=&;{}!$*)のみで入力してください" msgstr "" +#: ./plugins/bc-admin-third/templates/Admin/Users/edit_password.php:56 +#: ./plugins/bc-admin-third/templates/Admin/element/Users/form.php:149 +msgid "{0}文字以上で入力してください。" +msgstr "" + +#: ./plugins/bc-admin-third/templates/Admin/Users/edit_password.php:63 +#: ./plugins/bc-admin-third/templates/Admin/element/Users/form.php:156 +msgid "{0}を含む必要があります。" +msgstr "" + #: ./plugins/bc-admin-third/templates/Admin/Users/index.php:24 msgid "ユーザー一覧" msgstr "" diff --git a/plugins/baser-core/resources/locales/en/baser_core.po b/plugins/baser-core/resources/locales/en/baser_core.po index f79065315a..1f1999b10c 100755 --- a/plugins/baser-core/resources/locales/en/baser_core.po +++ b/plugins/baser-core/resources/locales/en/baser_core.po @@ -5059,6 +5059,16 @@ msgstr "" "Please enter only with half-size alphabets and numbers (alphabets are " "distinct by large or small), spaces, symbols (._-:/()#,@[]+=&;{}!$*)." +#: plugins/bc-admin-third/templates/Admin/Users/edit_password.php:56 +#: plugins/bc-admin-third/templates/Admin/element/Users/form.php:149 +msgid "{0}文字以上で入力してください。" +msgstr "Please enter {0} or more characters." + +#: plugins/bc-admin-third/templates/Admin/Users/edit_password.php:63 +#: plugins/bc-admin-third/templates/Admin/element/Users/form.php:156 +msgid "{0}を含む必要があります。" +msgstr "{0} is required." + #: plugins/bc-admin-third/templates/Admin/Users/index.php:24 msgid "ユーザー一覧" msgstr "User List" diff --git a/plugins/bc-admin-third/templates/Admin/Users/edit_password.php b/plugins/bc-admin-third/templates/Admin/Users/edit_password.php index 28c11bb0f0..bfdc142b91 100644 --- a/plugins/bc-admin-third/templates/Admin/Users/edit_password.php +++ b/plugins/bc-admin-third/templates/Admin/Users/edit_password.php @@ -9,8 +9,10 @@ * @license https://basercms.net/license/index.html MIT License */ -use BaserCore\View\BcAdminAppView; use BaserCore\Model\Entity\User; +use BaserCore\Utility\BcSiteConfig; +use BaserCore\View\BcAdminAppView; +use Cake\Core\Configure; /** * Users Edit @@ -51,6 +53,28 @@
  • +
  • + + + + + +
  • + + __d('baser_core', '数字'), + 'uppercase' => __d('baser_core', '大文字英字'), + 'lowercase' => __d('baser_core', '小文字英字'), + 'symbol' => __d('baser_core', '記号'), + ]; + $requiredTypes = Configure::read('BcApp.passwordRule.requiredCharacterTypes') ?: []; + $requiredNames = array_values(array_intersect_key($requiredCharacterTypeNames, array_flip($requiredTypes))); + ?> + +
  • + + BcAdminForm->error('password') ?> diff --git a/plugins/bc-admin-third/templates/Admin/element/Users/form.php b/plugins/bc-admin-third/templates/Admin/element/Users/form.php index 3e84732362..d0f6b1dc25 100755 --- a/plugins/bc-admin-third/templates/Admin/element/Users/form.php +++ b/plugins/bc-admin-third/templates/Admin/element/Users/form.php @@ -10,7 +10,9 @@ */ use BaserCore\Model\Entity\User; +use BaserCore\Utility\BcSiteConfig; use BaserCore\View\BcAdminAppView; +use Cake\Core\Configure; /** * Users Form @@ -144,6 +146,28 @@ class="col-head bca-form-table__label">BcAdminForm->label('use
  • +
  • + + + + + +
  • + + __d('baser_core', '数字'), + 'uppercase' => __d('baser_core', '大文字英字'), + 'lowercase' => __d('baser_core', '小文字英字'), + 'symbol' => __d('baser_core', '記号'), + ]; + $requiredTypes = Configure::read('BcApp.passwordRule.requiredCharacterTypes') ?: []; + $requiredNames = array_values(array_intersect_key($requiredCharacterTypeNames, array_flip($requiredTypes))); + ?> + +
  • + + BcAdminForm->error('password') ?>