Merge pull request #4 from ryo-endo/translation/add-messages-ja_custo…

…mercontroller admin/CustomerControllerのテストが通るように修正
okazy · Feb 20, 2018 · dee98ec · dee98ec
2 parents 6740e6f + 9c6d65a
commit dee98ec
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/Eccube/Resource/locale/messages.ja.php b/src/Eccube/Resource/locale/messages.ja.php
@@ -692,7 +692,7 @@
     'admin.customer.index.131' => ' 〜 ',
     'admin.customer.index.132' => '検索条件をクリア',
     'admin.customer.index.133' => '検索する',
-    'admin.customer.index.134' => '検索結果<br>%count%件が該当しました',
+    'admin.customer.index.134' => '検索結果 %count% 件 が該当しました',
     'admin.customer.index.135' => '%count%件',
     'admin.customer.index.136' => '%count%件',
     'admin.customer.index.137' => 'CSVダウンロード',

diff --git a/src/Eccube/Resource/template/admin/Customer/index.twig b/src/Eccube/Resource/template/admin/Customer/index.twig
@@ -43,42 +43,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     inputDate.setAttribute('type', 'date');
     if (inputDate.type !== 'date') {
       $('input[id$=_date_start]').datetimepicker({
-        locale: '{{app.config.locale}}',
+        locale: '{{eccube_config.locale}}',
         format: 'YYYY-MM-DD',
         useCurrent: false,
         showTodayButton: true
       });
 
       $('input[id$=_date_end]').datetimepicker({
-        locale: '{{app.config.locale}}',
+        locale: '{{eccube_config.locale}}',
         format: 'YYYY-MM-DD',
         useCurrent: false,
         showTodayButton: true
       });
 
       $('#admin_search_customer_birth_start').datetimepicker({
-        locale: '{{app.config.locale}}',
+        locale: '{{eccube_config.locale}}',
         format: 'YYYY-MM-DD',
         useCurrent: false,
         showTodayButton: true
       });
 
       $('#admin_search_customer_birth_end').datetimepicker({
-        locale: '{{app.config.locale}}',
+        locale: '{{eccube_config.locale}}',
         format: 'YYYY-MM-DD',
         useCurrent: false,
         showTodayButton: true
       });
 
       $('#admin_search_customer_last_buy_start').datetimepicker({
-        locale: '{{app.config.locale}}',
+        locale: '{{eccube_config.locale}}',
         format: 'YYYY-MM-DD',
         useCurrent: false,
         showTodayButton: true
       });
 
       $('#admin_search_customer_last_buy_end').datetimepicker({
-        locale: '{{app.config.locale}}',
+        locale: '{{eccube_config.locale}}',
         format: 'YYYY-MM-DD',
         useCurrent: false,
         showTodayButton: true

diff --git a/src/Eccube/Resource/template/default/Entry/confirm.twig b/src/Eccube/Resource/template/default/Entry/confirm.twig
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                                 {{ form_widget(form.name.name02, { type : 'hidden' }) }}
                             </dd>
                         </dl>
-                        {% if app.config.locale == "ja" %}
+                        {% if eccube_config.locale == "ja" %}
                         <dl>
                             <dt>
                                 {{ form_label(form.kana, 'signup.label.name_kana', {'label_attr': {'class': 'ec-label'}}) }}

diff --git a/src/Eccube/Resource/template/default/Entry/index.twig b/src/Eccube/Resource/template/default/Entry/index.twig
@@ -46,19 +46,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                             </dt>
                             <dd>
                                 <div class="ec-halfInput{{ has_errors(form.name.name01, form.name.name02) ? ' error'}}">
-                                    {% if app.config.locale == "ja" %}
+                                    {% if eccube_config.locale == "ja" %}
                                         {{ form_widget(form.name.name01, {'attr': {'placeholder': 'signup.label.family_name'}}) }}                                    
                                     {% endif %}
                                     {{ form_widget(form.name.name02, {'attr': {'placeholder': 'signup.label.first_name'}}) }}
-                                    {% if app.config.locale != "ja" %}
+                                    {% if eccube_config.locale != "ja" %}
                                         {{ form_widget(form.name.name01, {'attr': {'placeholder': 'signup.label.family_name'}}) }}                                    
                                     {% endif %}
                                     {{ form_errors(form.name.name01) }}
                                     {{ form_errors(form.name.name02) }}
                                 </div>
                             </dd>
                         </dl>
-                        {% if app.config.locale == "ja" %}
+                        {% if eccube_config.locale == "ja" %}
                         <dl>
                             <dt>
 
@@ -96,7 +96,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                                     {{ form_errors(form.zip.zip01) }}
                                     {{ form_errors(form.zip.zip02) }}
                                 </div>
-                                {% if app.config.locale == "ja" %}
+                                {% if eccube_config.locale == "ja" %}
                                 <div class="ec-zipInputHelp">
                                     <a href="http://www.post.japanpost.jp/zipcode/"
                                                                 target="_blank">