[Svn-src-all:3590] [version-2_12-multilang 22502] #2084 ID振り直し SC_Utils系
kim
admin ＠ mail.ec-cube.net
2013年 2月 5日 (火) 13:58:28 JST
Subversion committed to /home/svn/open 22502
http://svn.ec-cube.net/open_trac/changeset/22502
┌────────────────────────────┐
│更新者 : kim │
│更新日時: 2013-02-05 13:58:27 +0900 (火, 05 2月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2084 ID振り直し SC_Utils系
#2084 ID振り直し 重複テキストの調整
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
_U branches/version-2_12-multilang/
U branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
U branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
U branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
U branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
U branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
U branches/version-2_12-multilang/data/class/util/SC_Utils.php
U branches/version-2_12-multilang/data/locales/en-US.mo
U branches/version-2_12-multilang/data/locales/en-US.po
U branches/version-2_12-multilang/data/locales/ja.mo
U branches/version-2_12-multilang/data/locales/ja.po
Property changes on: branches/version-2_12-multilang
___________________________________________________________________
変更: svk:merge
- 15179af3-f7c7-564b-996f-01402db0ec98:/cube-ml-001:354
8542061c-9c18-c943-b834-b5b361a76c87:/cube-ml-001:255
ca513dc5-e535-214e-9b15-241195261559:/b-cube-ml:217
ca513dc5-e535-214e-9b15-241195261559:/cube-ml-001:863
+ 15179af3-f7c7-564b-996f-01402db0ec98:/cube-ml-001:357
8542061c-9c18-c943-b834-b5b361a76c87:/cube-ml-001:255
ca513dc5-e535-214e-9b15-241195261559:/b-cube-ml:217
ca513dc5-e535-214e-9b15-241195261559:/cube-ml-001:863
変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2013-02-05 04:58:27 UTC (rev 22502)
@@ -47,7 +47,7 @@
$this->tpl_mainno = 'order';
$this->tpl_subno = '';
$this->tpl_maintitle = t('c_Orders_01');
- $this->tpl_subtitle = t('LC_Page_Admin_Order_ProductSelect_001');
+ $this->tpl_subtitle = t('c_Product selection_01');
$masterData = new SC_DB_MasterData_Ex();
$this->arrPRODUCTSTATUS_COLOR = $masterData->getMasterData('mtb_product_status_color');
変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2013-02-05 04:58:27 UTC (rev 22502)
@@ -47,7 +47,7 @@
$this->tpl_mainno = 'order';
$this->tpl_subno = 'status';
$this->tpl_maintitle = t('c_Orders_01');
- $this->tpl_subtitle = t('LC_Page_Admin_Order_Status_001');
+ $this->tpl_subtitle = t('c_Response status_02');
$masterData = new SC_DB_MasterData_Ex();
$this->arrORDERSTATUS = $masterData->getMasterData('mtb_order_status');
変更: branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php 2013-02-05 04:58:27 UTC (rev 22502)
@@ -496,7 +496,7 @@
return $arrErr;
}
if (!isset($arrPluginInfo['CLASS_NAME'])) {
- $arrErr['plugin_file'] = t('LC_Page_Admin_OwnersStore_006');
+ $arrErr['plugin_file'] = t('c_* CLASS_NAME is not defined.<br/>_01');
return $arrErr;
}
$plugin_class_file_path = $dir_path . $arrPluginInfo['CLASS_NAME'] . '.php';
変更: branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2013-02-05 04:58:27 UTC (rev 22502)
@@ -579,7 +579,7 @@
} else {
// SC_CheckError::FILE_EXT_CHECK とのソース互換を強めるための配列
$value = array(
- 0 => t('LC_Page_Admin_Products_ProductClass_012'),
+ 0 => t('c_File name for download sales_01'),
1 => 'down_realfilename',
2 => explode(',', DOWNLOAD_EXTENSION),
);
変更: branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2013-02-05 04:58:27 UTC (rev 22502)
@@ -47,7 +47,7 @@
$this->tpl_mainno = 'products';
$this->tpl_subno = '';
$this->tpl_maintitle = t('c_Products_01');
- $this->tpl_subtitle = t('LC_Page_Admin_Products_ProductSelect_001');
+ $this->tpl_subtitle = t('c_Product selection_01');
$masterData = new SC_DB_MasterData_Ex();
$this->arrPRODUCTSTATUS_COLOR = $masterData->getMasterData('mtb_product_status_color');
変更: branches/version-2_12-multilang/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-multilang/data/class/util/SC_Utils.php 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/class/util/SC_Utils.php 2013-02-05 04:58:27 UTC (rev 22502)
@@ -48,7 +48,7 @@
}
$path = HTML_REALDIR . 'install/' . DIR_INDEX_FILE;
if (file_exists($path)) {
- SC_Utils_Ex::sfErrorHeader(t('SC_Utils_001', array('T_ARG1' => DIR_INDEX_FILE)));
+ SC_Utils_Ex::sfErrorHeader(t('c_>> /install/T_ARG1, delete this file after completing installation._01', array('T_ARG1' => DIR_INDEX_FILE)));
}
}
@@ -1147,12 +1147,12 @@
$mess = SC_Utils_Ex::sfCopyDir($data_.'/', $des.$data.'/', $mess);
} else {
if (!$override && file_exists($des.$data)) {
- $mess.= t('SC_Utils_003', array('T_ARG1' => $des, 'T_ARG2' => $data));
+ $mess.= t('c_T_ARG1T_ARG2: File exists_01', array('T_ARG1' => $des, 'T_ARG2' => $data));
} else {
if (@copy($data_, $des.$data)) {
- $mess.= t('SC_Utils_004', array('T_ARG1' => $des, 'T_ARG2' => $data));
+ $mess.= t('c_T_ARG1T_ARG2: Copy success_01', array('T_ARG1' => $des, 'T_ARG2' => $data));
} else {
- $mess.= t('SC_Utils_005', array('T_ARG1' => $des, 'T_ARG2' => $data));
+ $mess.= t('c_T_ARG1T_ARG2: Copy failure_01', array('T_ARG1' => $des, 'T_ARG2' => $data));
}
}
$mod=stat($data_);
変更: branches/version-2_12-multilang/data/locales/en-US.mo
===================================================================
(バイナリファイルが異なっています)
変更: branches/version-2_12-multilang/data/locales/en-US.po
===================================================================
--- branches/version-2_12-multilang/data/locales/en-US.po 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/locales/en-US.po 2013-02-05 04:58:27 UTC (rev 22502)
@@ -2860,10 +2860,10 @@
msgid "c_Enter a number between 1
- 31 for the issuance date._01"
msgstr "Enter a number between 1
- 31 for the issuance date."
-msgid "LC_Page_Admin_Order_ProductSelect_001"
+msgid "c_Product selection_01"
msgstr "Product selection"
-msgid "LC_Page_Admin_Order_Status_001"
+msgid "c_Response status_02"
msgstr "Response status"
msgid "c_Plug-in management_01"
@@ -2881,7 +2881,7 @@
msgid "c_* PLUGIN_NAME is not defined.<br/>_01"
msgstr "* PLUGIN_NAME is not defined.<br/>"
-msgid "LC_Page_Admin_OwnersStore_006"
+msgid "c_* CLASS_NAME is not defined.<br/>_01"
msgstr "* CLASS_NAME is not defined.<br/>"
msgid "c_* CLASS_NAME is not properly defined.<br/>_01"
@@ -3017,18 +3017,12 @@
"* For the file size of the file name for download sales, use one that is "
"T_ARG1T_ARG2 or less <br />"
-msgid "LC_Page_Admin_Products_ProductClass_012"
-msgstr "File name for download sales"
-
msgid "c_* The format permitted for T_ARG1 is T_ARG2.<br />_01"
msgstr "* The format permitted for T_ARG1 is T_ARG2.<br />"
msgid "c_Product rearrangement_01"
msgstr "Product rearrangement"
-msgid "LC_Page_Admin_Products_ProductSelect_001"
-msgstr "Product selection"
-
msgid "c_Review management_01"
msgstr "Review management"
@@ -3397,17 +3391,17 @@
msgid "c_Template operation failed._01"
msgstr "Template operation failed."
-msgid "SC_Utils_001"
+msgid "c_>> /install/T_ARG1, delete this file after completing installation._01"
msgstr ""
">> /install/T_ARG1, delete this file after completing installation."
-msgid "SC_Utils_003"
+msgid "c_T_ARG1T_ARG2: File exists_01"
msgstr "T_ARG1T_ARG2: File exists"
-msgid "SC_Utils_004"
+msgid "c_T_ARG1T_ARG2: Copy success_01"
msgstr "T_ARG1T_ARG2: Copy success"
-msgid "SC_Utils_005"
+msgid "c_T_ARG1T_ARG2: Copy failure_01"
msgstr "T_ARG1T_ARG2: Copy failure"
msgid "tpl_Delivery company_01"
変更: 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 2013-02-05 03:54:00 UTC (rev 22501)
+++ branches/version-2_12-multilang/data/locales/ja.po 2013-02-05 04:58:27 UTC (rev 22502)
@@ -2841,10 +2841,10 @@
msgid "c_Enter a number between 1
- 31 for the issuance date._01"
msgstr "発行日は1
031の間で入力してください。"
-msgid "LC_Page_Admin_Order_ProductSelect_001"
+msgid "c_Product selection_01"
msgstr "商品選択"
-msgid "LC_Page_Admin_Order_Status_001"
+msgid "c_Response status_02"
msgstr "対応状況管理"
msgid "c_Plug-in management_01"
@@ -2862,7 +2862,7 @@
msgid "c_* PLUGIN_NAME is not defined.<br/>_01"
msgstr "※ PLUGIN_NAMEが定義されていません。<br/>"
-msgid "LC_Page_Admin_OwnersStore_006"
+msgid "c_* CLASS_NAME is not defined.<br/>_01"
msgstr "※ CLASS_NAMEが定義されていません。<br/>"
msgid "c_* CLASS_NAME is not properly defined.<br/>_01"
@@ -2992,18 +2992,12 @@
"※ ダウンロード販売用ファイル名のファイルサイズはT_ARG1T_ARG2以下のものを"
"使用してください。<br />"
-msgid "LC_Page_Admin_Products_ProductClass_012"
-msgstr "ダウンロード販売用ファイル名"
-
msgid "c_* The format permitted for T_ARG1 is T_ARG2.<br />_01"
msgstr "※ T_ARG1で許可されている形式は、T_ARG2です。<br />"
msgid "c_Product rearrangement_01"
msgstr "商品並び替え"
-msgid "LC_Page_Admin_Products_ProductSelect_001"
-msgstr "商品選択"
-
msgid "c_Review management_01"
msgstr "レビュー管理"
@@ -3362,17 +3356,17 @@
msgid "c_Template operation failed._01"
msgstr "テンプレートの操作に失敗しました。"
-msgid "SC_Utils_001"
+msgid "c_>> /install/T_ARG1, delete this file after completing installation._01"
msgstr ""
-">> /install/T_ARG1 は、インストール完了後にファイルを削除してください。"
+">> /install/T_ARG1 は、インストール完了後にファイルを削除してください。"
-msgid "SC_Utils_003"
+msgid "c_T_ARG1T_ARG2: File exists_01"
msgstr "T_ARG1T_ARG2：ファイルが存在します"
-msgid "SC_Utils_004"
+msgid "c_T_ARG1T_ARG2: Copy success_01"
msgstr "T_ARG1T_ARG2：コピー成功"
-msgid "SC_Utils_005"
+msgid "c_T_ARG1T_ARG2: Copy failure_01"
msgstr "T_ARG1T_ARG2：コピー失敗"
msgid "tpl_Delivery company_01"
Svn-src-all メーリングリストの案内