Skip to content

fix #4284 【プラグイン】カスタムコンテンツ:テーブル管理のテーブル登録・編集で識別名に半角大文字が使えない件のヘルプを修正 #4394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaburk wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
+13 −22
Open

fix #4284 【プラグイン】カスタムコンテンツ:テーブル管理のテーブル登録・編集で識別名に半角大文字が使えない件のヘルプを修正 #4394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/docker-compose.yml.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:

bc-smtp:
container_name: bc-smtp
image: schickling/mailcatcher
image: sj26/mailcatcher:latest
ports:
- "1080:1080"
- "1025:1025"
Expand Down
7 changes: 2 additions & 5 deletions plugins/baser-core/resources/locales/baser_core.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7529,6 +7529,7 @@ msgstr ""

#: ./plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomFields/form.php:60
#: ./plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomLinks/form.php:118
#: ./plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php:87
msgid "半角小文字英数字とアンダースコア（ _ ）のみ利用可能です。"
msgstr ""

Expand Down Expand Up @@ -7844,10 +7845,6 @@ msgstr ""
msgid "識別名"
msgstr ""

#: ./plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php:87
msgid "半角英数字とアンダースコアのみ利用できます。"
msgstr ""

#: ./plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php:106
msgid "表示名称フィールド"
msgstr ""
Expand Down Expand Up @@ -10529,7 +10526,7 @@ msgid "識別名を入力してください。"
msgstr ""

#: ./plugins/bc-custom-content/src/Model/Table/CustomTablesTable.php:101
msgid "識別名は半角英数字とアンダースコアのみで入力してください。"
msgid "識別名は半角英数小文字とアンダースコアのみで入力してください。"
msgstr ""

#: ./plugins/bc-custom-content/src/Model/Table/CustomTablesTable.php:106
Expand Down
12 changes: 3 additions & 9 deletions plugins/baser-core/resources/locales/en/baser_core.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8684,6 +8684,7 @@ msgstr "Field Name"

#: plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomFields/form.php:60
#: plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomLinks/form.php:118
#: plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php:87
msgid "半角小文字英数字とアンダースコア（ _ ）のみ利用可能です。"
msgstr ""
"Only half-width alphanumeric characters and underscores (_ ) are allowed."
Expand Down Expand Up @@ -9088,13 +9089,6 @@ msgstr ""
msgid "識別名"
msgstr "Distinguished Name"

#: plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php:87
#, fuzzy
#| msgid "半角小文字英数字とアンダースコア（ _ ）のみ利用可能です。"
msgid "半角英数字とアンダースコアのみ利用できます。"
msgstr ""
"Only half-width alphanumeric characters and underscores (_ ) are allowed."

#: plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php:106
msgid "表示名称フィールド"
msgstr "Display Name Field"
Expand Down Expand Up @@ -12312,9 +12306,9 @@ msgid "識別名を入力してください。"
msgstr "Please enter a distinguished name."

#: plugins/bc-custom-content/src/Model/Table/CustomTablesTable.php:101
msgid "識別名は半角英数字とアンダースコアのみで入力してください。"
msgid "識別名は半角英数小文字とアンダースコアのみで入力してください。"
msgstr ""
"Please enter the distinguished name only with single-byte alphanumeric "
"Please enter the distinguished name only with single-byte lowercase alphanumeric "
"characters and underscores."

#: plugins/bc-custom-content/src/Model/Table/CustomTablesTable.php:106
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomTables/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<?php echo $this->BcAdminForm->control('name', ['type' => 'text', 'size' => 40, 'maxlength' => 255]) ?>
<i class="bca-icon--question-circle bca-help"></i>
<div class="bca-helptext">
<?php echo __d('baser_core', '半角英数字とアンダースコアのみ利用できます。') ?>
<?php echo __d('baser_core', '半角英数小文字とアンダースコアのみ利用できます。') ?>
</div>
<?php echo $this->BcAdminForm->error('name') ?>
Comment thread
kaburk marked this conversation as resolved.
</td>
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-custom-content/src/Model/Table/CustomTablesTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function validationDefault(Validator $validator): Validator
->scalar('name')
->maxLength('name', 255, __d('baser_core', '255文字以内で入力してください。'))
->notEmptyString('name', __d('baser_core', '識別名を入力してください。'))
->regex('name', '/^[a-z0-9_]+$/', __d('baser_core', '識別名は半角英数字とアンダースコアのみで入力してください。'))
->regex('name', '/^[a-z0-9_]+$/', __d('baser_core', '識別名は半角英数小文字とアンダースコアのみで入力してください。'))
->add('name', [
'validateUnique' => [
'rule' => ['validateUnique'],
Expand Down
4 changes: 2 additions & 2 deletions plugins/bc-custom-content/tests/TestCase/Controller/Admin/Api/CustomTablesControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function test_add()
$result = json_decode((string)$this->_response->getBody());
$this->assertEquals('入力エラーです。内容を修正してください。', $result->message);
$this->assertEquals(
'識別名は半角英数字とアンダースコアのみで入力してください。',
'識別名は半角英数小文字とアンダースコアのみで入力してください。',
$result->errors->name->regex);
}

Expand Down Expand Up @@ -219,7 +219,7 @@ public function test_edit()
$result = json_decode((string)$this->_response->getBody());
$this->assertEquals('入力エラーです。内容を修正してください。', $result->message);
$this->assertEquals(
'識別名は半角英数字とアンダースコアのみで入力してください。',
'識別名は半角英数小文字とアンダースコアのみで入力してください。',
$result->errors->name->regex);

//不要なテーブルを削除
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-custom-content/tests/TestCase/Model/Table/CustomTablesTableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function test_validationDefault()
$errors = $validator->validate([
'name' => 'あ',
]);
$this->assertEquals('識別名は半角英数字とアンダースコアのみで入力してください。', current($errors['name']));
$this->assertEquals('識別名は半角英数小文字とアンダースコアのみで入力してください。', current($errors['name']));
//正常系実行
$errors = $validator->validate([
'name' => 'test',
Expand Down
4 changes: 2 additions & 2 deletions plugins/bc-custom-content/tests/TestCase/Service/CustomTablesServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public function test_create()
'name' => 'お問い合わせタイトル',
];
$this->expectException(PersistenceFailedException::class);
$this->expectExceptionMessage('Entity save failure. Found the following errors (name.regex: "識別名は半角英数字とアンダースコアのみで入力してください。")');
$this->expectExceptionMessage('Entity save failure. Found the following errors (name.regex: "識別名は半角英数小文字とアンダースコアのみで入力してください。")');
$this->CustomTablesService->create($data);
}

Expand Down Expand Up @@ -363,7 +363,7 @@ public function test_update()

//エラーする時をテスト
$this->expectException(PersistenceFailedException::class);
$this->expectExceptionMessage('Entity save failure. Found the following errors (name.regex: "識別名は半角英数字とアンダースコアのみで入力してください。")');
$this->expectExceptionMessage('Entity save failure. Found the following errors (name.regex: "識別名は半角英数小文字とアンダースコアのみで入力してください。")');
$this->CustomTablesService->update($this->CustomTablesService->get(1), ['name' => 'あああああ']);
}

Expand Down
Loading