From 5b00596db65bcc1c9777aebafd1cdabfa195444a Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 4 Jul 2016 16:58:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=ABerror=3Dfalse=E3=81=8C=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=95=E3=82=8C=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AB?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=82=82div=E3=82=BF=E3=82=B0=E3=82=92=E4=BB=98?= =?UTF-8?q?=E4=B8=8E=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Helper/NetCommonsFormHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/Helper/NetCommonsFormHelper.php b/View/Helper/NetCommonsFormHelper.php index 8fe909b0..3d89aa7a 100644 --- a/View/Helper/NetCommonsFormHelper.php +++ b/View/Helper/NetCommonsFormHelper.php @@ -437,7 +437,7 @@ public function input($fieldName, $options = array()) { //Form->input $input = ''; - if ($error) { + if ($error && Hash::get($inputOptions, 'error') !== false) { $input .= '
'; $input .= $this->_input($fieldName, $inputOptions); $input .= '
'; From 710e84dc54fc97640dd1b008680f42c3d5466bde Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 4 Jul 2016 19:21:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E8=A8=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Locale/jpn/LC_MESSAGES/net_commons.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Locale/jpn/LC_MESSAGES/net_commons.po b/Locale/jpn/LC_MESSAGES/net_commons.po index 5470ac82..0173d1c3 100644 --- a/Locale/jpn/LC_MESSAGES/net_commons.po +++ b/Locale/jpn/LC_MESSAGES/net_commons.po @@ -499,6 +499,12 @@ msgstr "いいえ" msgid "Display the number of each page" msgstr "1ページ毎の表示件数" +msgid "Created:" +msgstr "作成:" + +msgid "Modified:" +msgstr "更新:" + # #: 承認の文言