[Svn-src-all:3272] [version-2_12-multilang 22173] #1986 default関数のテキストを切り出しました。

m_uehara admin @ mail.ec-cube.net
2012年 12月 27日 (木) 16:49:41 JST


Subversion committed to /home/svn/open 22173
http://svn.ec-cube.net/open_trac/changeset/22173
┌────────────────────────────┐
│更新者 :  m_uehara                                     │
│更新日時:  2012-12-27 16:49:41 +0900 (木, 27 12月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1986 default関数のテキストを切り出しました。

Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
U   branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/mail/query.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class_confirm.tpl
U   branches/version-2_12-multilang/data/locales/en.mo
U   branches/version-2_12-multilang/data/locales/en.po
U   branches/version-2_12-multilang/data/locales/ja.mo
U   branches/version-2_12-multilang/data/locales/ja.po

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -105,7 +105,7 @@
             </tr>
             <tr>
                 <th><!--{t string="tpl_216"}--></th>
-                <td><!--{$arrJob[$arrForm.job]|default:"未登録"|h}--></td>
+                <td><!--{$arrJob[$arrForm.job]|default_t:"tpl_242"|h}--></td>
             </tr>
             <tr>
                 <th><!--{t string="tpl_217"}--></th>
@@ -134,7 +134,7 @@
             </tr>
             <tr>
                 <th><!--{t string="tpl_225"}--></th>
-                <td><!--{$arrForm.note|h|nl2br|default:"未登録"}--></td>
+                <td><!--{$arrForm.note|h|nl2br|default_t:"tpl_242"}--></td>
             </tr>
             <tr>
                 <th><!--{t string="tpl_226"}--></th>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/mail/query.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/mail/query.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/mail/query.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -38,7 +38,7 @@
     <table class="form">
         <tr>
             <th><!--{t string="tpl_207"}--></th>
-            <td><!--{$arrSearchData.search_customer_id|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_customer_id|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_258"}--></th>
@@ -50,11 +50,11 @@
         </tr>
         <tr>
             <th><!--{t string="tpl_208"}--></th>
-            <td><!--{$arrSearchData.search_name|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_name|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_210"}--></th>
-            <td><!--{$arrSearchData.search_kana|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_kana|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_215"}--></th>
@@ -82,15 +82,15 @@
         </tr>
         <tr>
             <th><!--{t string="tpl_108"}--></th>
-            <td><!--{$arrSearchData.search_email|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_email|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_213"}--></th>
-            <td><!--{$arrSearchData.search_email_mobile|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_email_mobile|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_214"}--></th>
-            <td><!--{$arrSearchData.search_tel|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_tel|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_340"}--></th>
@@ -139,11 +139,11 @@
         </tr>
         <tr>
             <th><!--{t string="tpl_343"}--></th>
-            <td><!--{$arrSearchData.search_buy_product_name|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_buy_product_name|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_344"}--></th>
-            <td><!--{$arrSearchData.search_buy_product_code|default:"(未指定)"|h}--></td>
+            <td><!--{$arrSearchData.search_buy_product_code|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_191"}--></th>
@@ -157,11 +157,11 @@
         </tr>
         <tr>
             <th><!--{t string="tpl_325"}--></th>
-            <td><!--{$arrHtmlmail[$arrSearchData.search_htmlmail]|default:"(未指定)"|h}--></td>
+            <td><!--{$arrHtmlmail[$arrSearchData.search_htmlmail]|default_t:"tpl_337"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_326"}--></th>
-            <td><!--{$arrMailType[$arrSearchData.search_mail_type]|default:"(未指定)"|h}--></td>
+            <td><!--{$arrMailType[$arrSearchData.search_mail_type]|default_t:"tpl_337"|h}--></td>
         </tr>
     </table>
 

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -47,11 +47,11 @@
         </tr>
         <tr>
             <th><!--{t string="tpl_361"}--></th>
-            <td><!--{$arrForm.payment_date.value|sfDispDBDate|default:"未入金"}--></td>
+            <td><!--{$arrForm.payment_date.value|sfDispDBDate|default_t:"tpl_443"}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_233"}--></th>
-            <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"}--></td>
+            <td><!--{$arrForm.commit_date.value|sfDispDBDate|default_t:"tpl_234"}--></td>
         </tr>
     </table>
 
@@ -131,7 +131,7 @@
                 <!--{$arrForm.product_code.value[$product_index]|h}-->
             </td>
             <td>
-                <!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default:"(なし)"|h}-->
+                <!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default_t:"tpl_729"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default_t:"tpl_729"|h}-->
             </td>
             <td align="center">
                     <!--{t string="currency_prefix"}--><!--{$arrForm.price.value[$product_index]|h}--><!--{t string="currency_suffix"}-->
@@ -215,7 +215,7 @@
                                 <!--{assign var=key1 value="shipment_product_name"}-->
                                 <!--{assign var=key2 value="shipment_classcategory_name1"}-->
                                 <!--{assign var=key3 value="shipment_classcategory_name2"}-->
-                                <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"(なし)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"(なし)"|h}-->
+                                <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default_t:"tpl_729"|h}-->/<!--{$arrShipping[$key3][$item_index]|default_t:"tpl_729"|h}-->
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
@@ -279,7 +279,7 @@
             <tr>
                 <th><!--{t string="tpl_386"}--></th>
                 <td>
-                    <!--{$arrDelivTime[$arrShipping.time_id]|default:"指定無し"}-->
+                    <!--{$arrDelivTime[$arrShipping.time_id]|default_t:"tpl_388"}-->
                 </td>
             </tr>
             <tr>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -130,11 +130,11 @@
         </tr>
         <tr>
             <th><!--{t string="tpl_361"}--></th>
-            <td><!--{$arrForm.payment_date.value|sfDispDBDate|default:"未入金"|h}--></td>
+            <td><!--{$arrForm.payment_date.value|sfDispDBDate|default_t:"tpl_443"|h}--></td>
         </tr>
         <tr>
             <th><!--{t string="tpl_233"}--></th>
-            <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"|h}--></td>
+            <td><!--{$arrForm.commit_date.value|sfDispDBDate|default_t:"tpl_234"|h}--></td>
         </tr>
     </table>
 
@@ -289,7 +289,7 @@
                 <input type="hidden" name="product_code[<!--{$product_index}-->]" value="<!--{$arrForm.product_code.value[$product_index]|h}-->" id="product_code_<!--{$product_index}-->" />
             </td>
             <td>
-                <!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default:"(なし)"|h}-->
+                <!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default_t:"tpl_729"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default_t:"tpl_729"|h}-->
                 <input type="hidden" name="product_name[<!--{$product_index}-->]" value="<!--{$arrForm.product_name.value[$product_index]|h}-->" id="product_name_<!--{$product_index}-->" />
                 <input type="hidden" name="classcategory_name1[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name1.value[$product_index]|h}-->" id="classcategory_name1_<!--{$product_index}-->" />
                 <input type="hidden" name="classcategory_name2[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name2.value[$product_index]|h}-->" id="classcategory_name2_<!--{$product_index}-->" />
@@ -448,7 +448,7 @@
                                 <input type="hidden" name="<!--{$key1}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key1][$item_index]|h}-->" />
                                 <input type="hidden" name="<!--{$key2}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key2][$item_index]|h}-->" />
                                 <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
-                                <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"(なし)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"(なし)"|h}-->
+                                <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default_t:"tpl_729"|h}-->/<!--{$arrShipping[$key3][$item_index]|default_t:"tpl_729"|h}-->
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -395,7 +395,7 @@
             <!--{assign var=payment_id value="`$arrResults[cnt].payment_id`"}-->
             <td class="center"><!--{$arrPayments[$payment_id]}--></td>
             <td class="right"><!--{$arrResults[cnt].total|number_format}--></td>
-            <td class="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default:"未発送"}--></td>
+            <td class="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default_t:"tpl_234"}--></td>
             <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
             <td class="center">
                 <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"><!--{t string="tpl_406"}--></label><br>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -154,7 +154,7 @@
         <tr>
             <th><!--{t string="tpl_561"}--></th>
             <td>
-                <!--{$arrForm.sale_limit|default:'無制限'|h}-->
+                <!--{$arrForm.sale_limit|default_t:"tpl_053"|h}-->
             </td>
         </tr>
         <tr>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -194,8 +194,8 @@
         <col width="8%" />
         <tr>
             <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br><!--{t string="tpl_488"}--></label></th>
-            <th><!--{t string="tpl_371"}--><br>(<!--{$arrClass[$class_id1]|default:"未選択"|h}-->)</th>
-            <th><!--{t string="tpl_374"}--><br>(<!--{$arrClass[$class_id2]|default:"未選択"|h}-->)</th>
+            <th><!--{t string="tpl_371"}--><br>(<!--{$arrClass[$class_id1]|default_t:"tpl_730"|h}-->)</th>
+            <th><!--{t string="tpl_374"}--><br>(<!--{$arrClass[$class_id2]|default_t:"tpl_730"|h}-->)</th>
             <th><!--{t string="tpl_192"}--></th>
             <th><!--{t string="tpl_557_1"}--></th>
             <th><!--{t string="tpl_603" T_FIELD=$smarty.const.NORMAL_PRICE_TITLE}--></th>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class_confirm.tpl	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/products/product_class_confirm.tpl	2012-12-27 07:49:41 UTC (rev 22173)
@@ -57,8 +57,8 @@
         <!--{assign var=class_id2 value=$arrForm[$key2].value|h}-->
         <table class="list">
                 <tr>
-                <th><!--{t string="tpl_371"}-->(<!--{$arrClass[$class_id1]|default:"未選択"|h}-->)</th>
-                <th><!--{t string="tpl_374"}-->(<!--{$arrClass[$class_id2]|default:"未選択"|h}-->)</th>
+                <th><!--{t string="tpl_371"}-->(<!--{$arrClass[$class_id1]|default_t:"tpl_730"|h}-->)</th>
+                <th><!--{t string="tpl_374"}-->(<!--{$arrClass[$class_id2]|default_t:"tpl_730"|h}-->)</th>
                 <th><!--{t string="tpl_192"}--></th>
                 <th><!--{t string="tpl_557"}--></th>
                 <th><!--{t string="tpl_603" T_FIELD=$smarty.const.NORMAL_PRICE_TITLE}--></th>

変更: branches/version-2_12-multilang/data/locales/en.mo
===================================================================
(バイナリファイルが異なっています)

変更: branches/version-2_12-multilang/data/locales/en.po
===================================================================
--- branches/version-2_12-multilang/data/locales/en.po	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/locales/en.po	2012-12-27 07:49:41 UTC (rev 22173)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: EC-CUBE Core\n"
 "POT-Creation-Date: 2012-05-07 13T_39+0900\n"
-"PO-Revision-Date: 2012-12-26 21:40+0900\n"
+"PO-Revision-Date: 2012-12-27 16:44+0900\n"
 "Last-Translator: MATSUDA Terutaka <matsudaterutaka @ gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -5914,6 +5914,12 @@
 msgid "tpl_728"
 msgstr "T_FIELD月"
 
+msgid "tpl_729"
+msgstr "(None)"
+
+msgid "tpl_730"
+msgstr "Not selected"
+
 msgid "-"
 msgstr " - "
 

変更: branches/version-2_12-multilang/data/locales/ja.mo
===================================================================
(バイナリファイルが異なっています)

変更: branches/version-2_12-multilang/data/locales/ja.po
===================================================================
--- branches/version-2_12-multilang/data/locales/ja.po	2012-12-27 06:33:59 UTC (rev 22172)
+++ branches/version-2_12-multilang/data/locales/ja.po	2012-12-27 07:49:41 UTC (rev 22173)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: EC-CUBE Core\n"
 "POT-Creation-Date: 2012-05-07 13T_39+0900\n"
-"PO-Revision-Date: 2012-12-26 21:40+0900\n"
+"PO-Revision-Date: 2012-12-27 14:19+0900\n"
 "Last-Translator: MATSUDA Terutaka <matsudaterutaka @ gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -5840,6 +5840,12 @@
 msgid "tpl_728"
 msgstr "T_FIELD月"
 
+msgid "tpl_729"
+msgstr "(なし)"
+
+msgid "tpl_730"
+msgstr "未選択"
+
 msgid "-"
 msgstr "〜"
 




Svn-src-all メーリングリストの案内