fix #3009 コンテンツ管理で固定ページを複製するとタイトルが消えて_copyだけのタイトルになってしまう問題を解消 (#3062)

Co-authored-by: ryuring <egashira@catchup.co.jp>

plugins/baser-core/resources/locales/cake.pot

@@ -4,8 +4,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CakePHP 4.4.12\n"
-"POT-Creation-Date: 2023-04-24 13:31+0900\n"
+"Project-Id-Version: CakePHP 4.4.17\n"
+"POT-Creation-Date: 2024-01-22 17:44+0900\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -14,71 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1104
-msgid "January"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1105
-msgid "February"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1106
-msgid "March"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1107
-msgid "April"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1108
-msgid "May"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1109
-msgid "June"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1110
-msgid "July"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1111
-msgid "August"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1112
-msgid "September"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1113
-msgid "October"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1114
-msgid "November"
-msgstr ""
-
-#: ./plugins/baser-core/src/View/Helper/BcFormHelper.php:1115
-msgid "December"
-msgstr ""
-
-#: ./templates/Error/error400.php:36
-#: ./templates/Error/error500.php:40
-#: ./tmp/basercms/templates/Error/error400.php:36
-#: ./tmp/basercms/templates/Error/error500.php:40
-msgid "Error"
-msgstr ""
-
-#: ./templates/Error/error400.php:37
-#: ./tmp/basercms/templates/Error/error400.php:37
-msgid "The requested address {0} was not found on this server."
-msgstr ""
-
-#: ./templates/Error/error500.php:38
-#: ./tmp/basercms/templates/Error/error500.php:38
-msgid "An Internal Error Has Occurred"
-msgstr ""
-
 #: ./vendor/cakephp/cakephp/src/Controller/Component/AuthComponent.php:462
 msgid "You are not authorized to access that location."
 msgstr ""

plugins/baser-core/resources/locales/default.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2023-04-24 13:31+0900\n"
+"POT-Creation-Date: 2024-01-22 17:44+0900\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -14,16 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ./templates/layout/error.php:40
-#: ./tmp/basercms/templates/layout/error.php:40
-msgid "Back"
-msgstr ""
-
-#: ./vendor/cakephp/cakephp/src/View/Helper/PaginatorHelper.php:1260
+#: ./vendor/cakephp/cakephp/src/View/Helper/PaginatorHelper.php:1258
 msgid "View"
 msgstr ""
 
-#: ./vendor/imo-tikuwa/cakephp-soft-delete/src/Model/Table/SoftDeleteTrait.php:27
-msgid "Configured field `{0}` is missing from the table `{1}`."
-msgstr ""
-

plugins/baser-core/src/Model/Table/PagesTable.php

@@ -257,7 +257,7 @@ public function copy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId = nu
         $page->content = new Content([
 			'name' => $page->content->name,
 			'parent_id' => $newParentId,
-			'title' => $newTitle ?? $oldPage->title . '_copy',
+			'title' => $newTitle ?? __d('baser_core', '{0} のコピー', $oldPage->content->title),
 			'author_id' => $newAuthorId,
 			'site_id' => $newSiteId,
 			'description' => $page->content->description,

plugins/bc-admin-third/src/js/admin/_lib/jquery.bcTree.js

@@ -1026,7 +1026,9 @@
                         $.bcTree.settings[data.contentType]['exists'] = true;
                         $.bcTree.settings[data.contentType]['existsTitle'] = data.contentTitle;
                         data.contentId = result.content.id;
+                        data.name = result.content.name;
                         data.contentEntityId = result.content.entity_id;
+                        data.contentTitle = result.content.title;
                         data.contentTitle = data.contentTitle.replace(/&/g, '&')
                             .replace(/"/g, '"')
                             .replace(/'/g, ''')

plugins/bc-admin-third/templates/Admin/element/Users/form.php

@@ -134,7 +134,7 @@ class="col-head bca-form-table__label"><?php echo $this->BcAdminForm->label('use
         <?php if ($this->request->getParam('action') == 'edit'): ?><small>
           [<?php echo __d('baser_core', 'パスワードは変更する場合のみ入力してください') ?>]</small><br/><?php endif ?>
         <?php echo $this->BcAdminForm->control('password_1', ['type' => 'password', 'size' => 20, 'maxlength' => 255, 'autocomplete' => 'off']) ?>
-        <?php echo $this->BcAdminForm->control('password_2', ['type' => 'password', 'size' => 20, 'maxlength' => 255, 'autocomplete' => 'off', 'placeholder' => __d('baser-core', 'もう一度入力')]) ?>
+        <?php echo $this->BcAdminForm->control('password_2', ['type' => 'password', 'size' => 20, 'maxlength' => 255, 'autocomplete' => 'off', 'placeholder' => __d('baser_core', 'もう一度入力')]) ?>
         <i class="bca-icon--question-circle bca-help"></i>
         <div class="bca-helptext">
           <ul>