[Svn-src-all:3231] [version-2_12-multilang 22132] #1890 テキストの切り出しを統一

h_yoshimoto admin @ mail.ec-cube.net
2012年 12月 13日 (木) 21:07:31 JST


Subversion committed to /home/svn/open 22132
http://svn.ec-cube.net/open_trac/changeset/22132
┌────────────────────────────┐
│更新者 :  h_yoshimoto                                  │
│更新日時:  2012-12-13 21:07:30 +0900 (木, 13 12月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1890 テキストの切り出しを統一

Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
U   branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl
U   branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl
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/basis/delivery_input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -112,7 +112,7 @@
     <!--{if $smarty.const.INPUT_DELIV_FEE}-->
     <h2><!--{t string="tpl_017"}--></h2>
     <div class="btn">
-        ※全国一律送料 <input type='text' name='fee_all' class='box10' /> 円に設定する <a class="btn-normal" href="javascript:;" onclick="fnSetDelivFee(<!--{$smarty.const.DELIVFEE_MAX}-->); return false;"><span><!--{t string="tpl_019"}--></span></a>
+        <!--{t string="tpl_708"}--> <input type='text' name='fee_all' class='box10' /> <a class="btn-normal" href="javascript:;" onclick="fnSetDelivFee(<!--{$smarty.const.DELIVFEE_MAX}-->); return false;"><span><!--{t string="tpl_019"}--></span></a>
     </div>
     <table>
         <!--{section name=cnt loop=$smarty.const.DELIVFEE_MAX}-->

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -42,11 +42,11 @@
                     $("#latitude").val(latlng.lat());
                     $("#longitude").val(latlng.lng());
                 } else {
-                    alert(<!--{t string="tpl_061"}-->);
+                    alert('<!--{t string="tpl_061"}-->');
                 }
             });
         } else {
-            alert(<!--{t string="tpl_061"}-->);
+            alert('<!--{t string="tpl_061"}-->');
         }
     });
 

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -31,7 +31,7 @@
 }
 function checkFlagAndSubmit(){
     if ( flag == 1 ){
-        if( confirm(<!--{t string="tpl_064"}-->) ){
+        if( confirm('<!--{t string="tpl_064"}-->') ){
             fnSetvalAndSubmit( 'form1', 'mode', 'id_set' );
         } else {
             return false;

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -30,13 +30,13 @@
     $('#output_list').multiselect2side({
         selectedPosition: 'right',
         moveOptions: true,
-        labelsx: <!--{t string="tpl_142"}-->,
-        labeldx: <!--{t string="tpl_143"}-->,
-        labelTop: <!--{t string="tpl_144"}-->,
-        labelBottom: <!--{t string="tpl_145"}-->,
-        labelUp: <!--{t string="tpl_146"}-->,
-        labelDown: <!--{t string="tpl_147"}-->,
-        labelSort: <!--{t string="tpl_148"}-->
+        labelsx: '<!--{t string="tpl_142"}-->',
+        labeldx: '<!--{t string="tpl_143"}-->',
+        labelTop: '<!--{t string="tpl_144"}-->',
+        labelBottom: '<!--{t string="tpl_145"}-->',
+        labelUp: '<!--{t string="tpl_146"}-->',
+        labelDown: '<!--{t string="tpl_147"}-->',
+        labelSort: '<!--{t string="tpl_148"}-->'
     });
     // multiselect2side の初期選択を解除
     $('.ms2side__div select').val(null);
@@ -46,7 +46,7 @@
 });
 
 function lfFormModeDefautSetSubmit(form, mode) {
-    if (!window.confirm(<!--{t string="tpl_149"}-->)) {
+    if (!window.confirm('<!--{t string="tpl_149"}-->')) {
         return;
     }
     return fnSetFormSubmit(form, 'mode', mode);

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -70,9 +70,14 @@
     <div class="btn addnew">
         <a class="btn-normal" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','',''); return false;"><span><!--{t string="tpl_156"}--></span></a>
     </div>
-
-
-    <h2><!--{t string="tpl_154"}--><!--{if $arrForm.sql_id != ""}-->(<!--{t string="tpl_026"}-->:<!--{$arrForm.sql_name|h}-->)<!--{else}-->(<!--{t string="tpl_155"}-->)<!--{/if}--></h2>
+    <h2>
+        <!--{if $arrForm.sql_id != ""}-->
+            <!--{t string="tpl_703" T_FIELD=$arrForm.sql_name|h}-->
+        <!--{else}-->
+            <!--{t string="tpl_704"}-->
+        <!--{/if}-->
+    </h2>
+    
     <table id="contents-csv-sqlset" class="form">
         <tr>
             <th><!--{t string="tpl_002_1"}--></th>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -159,7 +159,7 @@
             <td>
                 <!--{if $arrErr.news_comment}--><span class="attention"><!--{$arrErr.news_comment}--></span><!--{/if}-->
                 <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment|h}--></textarea><br />
-                <span class="attention"> (<!--{t string="tpl_113"}-->)</span>
+                <span class="attention"> <!--{t string="tpl_113"}--></span>
             </td>
         </tr>
     </table>

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -109,9 +109,9 @@
                                 <!--{/if}-->
                             </div>
                             <div class="table-detail">
-                                <div class="detail-name"><!--{t string="tpl_188"}-->: <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
+                                <div class="detail-name"><!--{t string="tpl_188"}--> <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
                                 <!--{if $arrItems[$smarty.section.cnt.iteration].p_del_flg == '1'}-->
-                                    <div class="attention">※<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->は販売商品から削除されています。</div>
+                                    <div class="attention"><!--{t string="tpl_707" T_FIELD=$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
                                 <!--{/if}-->
                                     <div class="detail-form">
                                         <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -198,12 +198,12 @@
                 <th><!--{t string="tpl_221_1"}--></th>
                 <td>
                     <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
-                    <!--{t string="tpl_222"}-->:
+                    <!--{t string="tpl_222"}-->
                     <select class="top" name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
                         <option value="" selected="selected"><!--{t string="tpl_068"}--></option>
                         <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
                     </select><br />
-                    <!--{t string="tpl_223"}-->:
+                    <!--{t string="tpl_223"}-->
                     <input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" size="30" class="box30" <!--{if $arrErr.reminder_answer != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
                 </td>
             </tr>

変更: 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-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -118,8 +118,8 @@
             <tr>
                 <th><!--{t string="tpl_243"}--></th>
                 <td>
-                    <!--{t string="tpl_222"}-->: <!--{$arrReminder[$arrForm.reminder]|h}--><br />
-                    <!--{t string="tpl_223"}-->: <!--{$smarty.const.DEFAULT_PASSWORD}-->
+                    <!--{t string="tpl_222"}--> <!--{$arrReminder[$arrForm.reminder]|h}--><br />
+                    <!--{t string="tpl_223"}--> <!--{$smarty.const.DEFAULT_PASSWORD}-->
                 </td>
             </tr>
             <tr>

変更: 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-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -48,7 +48,7 @@
         }
 
         if(!checkflag){
-            alert(<!--{t string="tpl_398"}-->);
+            alert('<!--{t string="tpl_398"}-->');
             return false;
         }
 
@@ -100,7 +100,7 @@
         }
 
         if(!checkflag){
-            alert(<!--{t string="tpl_398"}-->);
+            alert('<!--{t string="tpl_398"}-->');
             return false;
         }
         

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -146,7 +146,7 @@
     }
 
     if (checkflag == 0){
-        alert(<!--{t string="tpl_398"}-->);
+        alert('<!--{t string="tpl_398"}-->');
         return false;
     }
 

変更: branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl	2012-12-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl	2012-12-13 12:07:30 UTC (rev 22132)
@@ -359,7 +359,7 @@
         </tr>
         <tr>
             <!--{assign var=key value="sub_image`$smarty.section.cnt.iteration`"}-->
-            <th>詳細-サブ画像(<!--{$smarty.section.cnt.iteration}-->)<br />[<!--{$smarty.const.NORMAL_SUBIMAGE_WIDTH}-->×<!--{$smarty.const.NORMAL_SUBIMAGE_HEIGHT}-->]</th>
+            <th><!--{t string="tpl_705" T_FIELD1=$smarty.section.cnt.iteration T_FIELD2=$smarty.const.NORMAL_SUBIMAGE_WIDTH T_FIELD3=$smarty.const.NORMAL_SUBIMAGE_HEIGHT}--></th>
             <td>
                 <a name="<!--{$key}-->"></a>
                 <!--{assign var=largekey value="sub_large_image`$smarty.section.cnt.iteration`"}-->
@@ -374,7 +374,7 @@
         </tr>
         <tr>
             <!--{assign var=key value="sub_large_image`$smarty.section.cnt.iteration`"}-->
-            <th>詳細-サブ拡大画像(<!--{$smarty.section.cnt.iteration}-->)<br />[<!--{$smarty.const.LARGE_SUBIMAGE_WIDTH}-->×<!--{$smarty.const.LARGE_SUBIMAGE_HEIGHT}-->]</th>
+            <th><!--{t string="tpl_706" T_FIELD1=$smarty.section.cnt.iteration T_FIELD2=$smarty.const.LARGE_SUBIMAGE_WIDTH T_FIELD3=$smarty.const.LARGE_SUBIMAGE_HEIGHT}--></th>
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
                 <!--{if $arrForm.arrFile[$key].filepath != ""}-->

変更: 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-12 07:29:07 UTC (rev 22131)
+++ branches/version-2_12-multilang/data/locales/ja.po	2012-12-13 12:07:30 UTC (rev 22132)
@@ -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-12 16:22+0900\n"
+"PO-Revision-Date: 2012-12-13 21:04+0900\n"
 "Last-Translator: MATSUDA Terutaka <matsudaterutaka @ gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -3740,7 +3740,7 @@
 msgstr "この位置を入力"
 
 msgid "tpl_061"
-msgstr "'所在地の場所が見つかりません'"
+msgstr "所在地の場所が見つかりません"
 
 msgid "tpl_062"
 msgstr "規約タイトル"
@@ -3753,8 +3753,7 @@
 
 msgid "tpl_064"
 msgstr ""
-"'内容が変更されています。続行すれば変更内容は破棄されます。宜しいでしょう"
-"か?'"
+"内容が変更されています。続行すれば変更内容は破棄されます。宜しいでしょうか?"
 
 msgid "tpl_065"
 msgstr "テンプレート<span class='attention'> *</span>"
@@ -3910,7 +3909,7 @@
 msgstr "別ウィンドウで開く"
 
 msgid "tpl_113"
-msgstr "上限3000文字"
+msgstr "(上限3000文字)"
 
 msgid "tpl_114"
 msgstr "新着情報一覧"
@@ -4008,28 +4007,28 @@
 "す。"
 
 msgid "tpl_142"
-msgstr "'CSV出力しない項目'"
+msgstr "CSV出力しない項目"
 
 msgid "tpl_143"
-msgstr "'CSV出力する項目'"
+msgstr "CSV出力する項目"
 
 msgid "tpl_144"
-msgstr "'一番上'"
+msgstr "一番上"
 
 msgid "tpl_145"
-msgstr "'一番下'"
+msgstr "一番下"
 
 msgid "tpl_146"
-msgstr "'一つ上'"
+msgstr "一つ上"
 
 msgid "tpl_147"
-msgstr "'一つ下'"
+msgstr "一つ下"
 
 msgid "tpl_148"
-msgstr "'項目順序'"
+msgstr "項目順序"
 
 msgid "tpl_149"
-msgstr "'初期設定で登録しても宜しいですか'"
+msgstr "初期設定で登録しても宜しいですか"
 
 msgid "tpl_150"
 msgstr "※ 正常に更新されました。"
@@ -4043,12 +4042,6 @@
 msgid "tpl_153"
 msgstr "CSV出力"
 
-msgid "tpl_154"
-msgstr "SQL設定"
-
-msgid "tpl_155"
-msgstr "新規入力"
-
 msgid "tpl_156"
 msgstr "SQLを新規入力"
 
@@ -4151,7 +4144,7 @@
 msgstr "商品/コメント"
 
 msgid "tpl_188"
-msgstr "商品名"
+msgstr "商品名:"
 
 msgid "tpl_189"
 msgstr "商品を選択する"
@@ -4286,10 +4279,10 @@
 msgstr "パスワードを忘れたときのヒント<span class='attention'> *</span>"
 
 msgid "tpl_222"
-msgstr "質問"
+msgstr "質問:"
 
 msgid "tpl_223"
-msgstr "答え"
+msgstr "答え:"
 
 msgid "tpl_224"
 msgstr "メールマガジン"
@@ -4829,7 +4822,7 @@
 msgstr "帳票出力"
 
 msgid "tpl_398"
-msgstr "'チェックボックスが選択されていません'"
+msgstr "チェックボックスが選択されていません"
 
 msgid "tpl_399"
 msgstr "更新日"
@@ -5768,3 +5761,21 @@
 
 msgid "tpl_702"
 msgstr "T_FIELD 円"
+
+msgid "tpl_703"
+msgstr "SQL設定(編集中:T_FIELD)"
+
+msgid "tpl_704"
+msgstr "SQL設定(新規入力)"
+
+msgid "tpl_705"
+msgstr "詳細-サブ画像(T_FIELD1)<br />[T_FIELD2×T_FIELD3]"
+
+msgid "tpl_706"
+msgstr "詳細-サブ拡大画像(T_FIELD1)<br />[T_FIELD2×T_FIELD3]"
+
+msgid "tpl_707"
+msgstr "※T_FIELDは販売商品から削除されています。"
+
+msgid "tpl_708"
+msgstr "※全国一律送料設定(円):"




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