Index: /branches/version-2_12-multilang/data/locales/ja.po
===================================================================
--- /branches/version-2_12-multilang/data/locales/ja.po (revision 22434)
+++ /branches/version-2_12-multilang/data/locales/ja.po (revision 22435)
@@ -13,5 +13,5 @@
msgid "SC_CheckError_001"
-msgstr "※ T_FIELDに許可されていないタグ T_TAG が含まれています。
"
+msgstr "※ T_FIELDに許可されていないタグ %s2 が含まれています。
"
msgid "SC_CheckError_002"
@@ -46,5 +46,5 @@
msgid "SC_CheckError_012"
-msgstr "※ T_FIELDはT_LENGTH字以下で入力してください。
"
+msgstr "※ T_FIELDは%s2字以下で入力してください。
"
msgid "SC_CheckError_013_SINGLE"
@@ -54,5 +54,5 @@
msgid "SC_CheckError_014"
-msgstr "※ T_FIELDはT_LENGTH以下で入力してください。
"
+msgstr "※ T_FIELDは%s2以下で入力してください。
"
msgid "SC_CheckError_015_SINGLE"
@@ -74,5 +74,5 @@
msgid "SC_CheckError_020"
-msgstr "※ T_FIELDはT_LENGTH字以内で入力してください。
"
+msgstr "※ T_FIELDは%s2字以内で入力してください。
"
msgid "SC_CheckError_021"
@@ -80,5 +80,5 @@
msgid "SC_CheckError_022"
-msgstr "※ T_FIELDはT_LENGTH文字以内で入力してください。
"
+msgstr "※ T_FIELDは%s2文字以内で入力してください。
"
msgid "SC_CheckError_023"
@@ -111,6 +111,6 @@
msgid "SC_CheckError_032_SINGLE"
msgid_plural "SC_CheckError_032_PLURAL"
-msgstr[0] "※ T_FIELDはT_COUNT桁~T_DIGIT_MAX桁で入力して下さい。
"
-msgstr[1] "※ T_FIELDはT_COUNT桁~T_DIGIT_MAX桁で入力して下さい。
"
+msgstr[0] "※ T_FIELDはT_COUNT桁~%s2桁で入力して下さい。
"
+msgstr[1] "※ T_FIELDはT_COUNT桁~%s2桁で入力して下さい。
"
msgid "SC_CheckError_033_SINGLE"
@@ -132,8 +132,8 @@
msgid "SC_CheckError_038"
-msgstr "※ T_FIELDで許可されている形式は、T_EXTです。
"
+msgstr "※ T_FIELDで許可されている形式は、%s2です。
"
msgid "SC_CheckError_039"
-msgstr "※ T_PATHが見つかりません。
"
+msgstr "※ %s1が見つかりません。
"
msgid "SC_CheckError_040"
@@ -142,5 +142,5 @@
msgid "SC_CheckError_041"
msgstr ""
-"※ T_FIELDのファイルサイズはT_SIZET_UNIT以下のものを使用してください。
"
+"※ T_FIELDのファイルサイズは%s2%s3以下のものを使用してください。
"
msgid "SC_CheckError_042"
@@ -157,5 +157,5 @@
msgid "SC_CheckError_046"
-msgstr "※ T_STARTとT_ENDの期間指定が不正です。
"
+msgstr "※ %s1と%s2の期間指定が不正です。
"
msgid "SC_CheckError_047"
@@ -182,14 +182,14 @@
msgid "SC_FormParam_001"
-msgstr "※ T_NAMEのファイルが存在しません。
"
+msgstr "※ %s1のファイルが存在しません。
"
msgid "SC_FormParam_002"
-msgstr "※※ エラーチェック形式(T_FUNCTION)には対応していません ※※
"
+msgstr "※※ エラーチェック形式(%s1)には対応していません ※※
"
msgid "SC_FormParam_003"
-msgstr "T_NAME(※ 必須)"
+msgstr "%s1(※ 必須)"
msgid "SC_FormParam_004"
-msgstr " [省略時初期値: T_DEFAULT]"
+msgstr " [省略時初期値: %s1]"
msgid "SC_FormParam_005"
@@ -206,14 +206,14 @@
msgid "SC_CartSession_003"
msgstr ""
-"※「T_PRODUCT」はまだ配送の準備ができておりません。恐れ入りますがお問い合わせ"
+"※「%s1」はまだ配送の準備ができておりません。恐れ入りますがお問い合わせ"
"ページよりお問い合わせください。"
msgid "SC_CartSession_004"
msgstr ""
-"※「T_PRODUCT」は販売制限(または在庫が不足)しております。一度に数量T_LIMITを超"
+"※「%s1」は販売制限(または在庫が不足)しております。一度に数量%s2を超"
"える購入はできません。"
msgid "SC_CartSession_005"
-msgstr "※「T_PRODUCT」は売り切れました。"
+msgstr "※「%s1」は売り切れました。"
msgid "SC_Fpdf_001"
@@ -266,8 +266,8 @@
msgid "SC_Fpdf_017"
-msgstr "作成日: T_YEAR年T_MONTH月T_DAY日"
+msgstr "作成日: %s1年%s2月%s3日"
msgid "SC_Fpdf_018"
-msgstr "T_LASTNAME T_FIRSTNAME 様"
+msgstr "%s1 %s2 様"
msgid "SC_Fpdf_019"
@@ -284,5 +284,5 @@
msgid "SC_Image_002"
-msgstr "T_FROM->T_TOのcopyに失敗しました。"
+msgstr "%s1->%s2のcopyに失敗しました。"
msgid "SC_Image_003"
@@ -301,9 +301,9 @@
msgstr ""
"
T_CACHE_REALDIR にユーザ書込み権限(777等)を付与して下さい。"
+"align: center\">%s1 にユーザ書込み権限(777等)を付与して下さい。"
"div>"
msgid "SC_Initial_002"
-msgstr "T_CACHE_REALDIR../mtb_constants_init.php が存在しません"
+msgstr "%s1../mtb_constants_init.php が存在しません"
msgid "SC_PageNavi_001"
@@ -329,8 +329,8 @@
msgid "SC_SendMail_002"
-msgstr "不明なバックエンド。[$backend = T_BACKEND]"
+msgstr "不明なバックエンド。[$backend = %s1]"
msgid "SC_SendMail_003"
-msgstr "メール送信に失敗しました。[T_MESSAGE]"
+msgstr "メール送信に失敗しました。[%s1]"
msgid "SC_View_001"
@@ -338,9 +338,9 @@
msgid "SC_UploadFile_001"
-msgstr "※ T_DISPNAMEがアップロードされていません。
"
+msgstr "※ %s1がアップロードされていません。
"
msgid "SC_UploadFile_002"
msgstr ""
-"※ T_DISPNAMEがアップロードされていません。(ファイルがアップロードできない場合"
+"※ %s1がアップロードされていません。(ファイルがアップロードできない場合"
"は、.htaccessファイルのphp_value upload_max_filesizeを調整してください)
"
@@ -409,5 +409,5 @@
msgid "SC_Helper_Mail_001"
-msgstr "該当する受注が存在しない。(注文番号: T_ORDER_ID)"
+msgstr "該当する受注が存在しない。(注文番号: %s1)"
msgid "SC_Helper_Mail_002"
@@ -1920,5 +1920,5 @@
msgid "FORMAT_NAME_FULL_SIR"
-msgstr "T_LASTNAME T_FIRSTNAME 様"
+msgstr "%s1 %s2 様"
msgid "LC_Page_Abouts_001"
Index: /branches/version-2_12-multilang/data/locales/en-US.po
===================================================================
--- /branches/version-2_12-multilang/data/locales/en-US.po (revision 22434)
+++ /branches/version-2_12-multilang/data/locales/en-US.po (revision 22435)
@@ -13,5 +13,5 @@
msgid "SC_CheckError_001"
-msgstr "* T_TAG contains the tag T_FIELD which is not allowed.
"
+msgstr "* %s2 contains the tag T_FIELD which is not allowed.
"
msgid "SC_CheckError_002"
@@ -50,5 +50,5 @@
msgid "SC_CheckError_012"
-msgstr "* For T_FIELD, enter T_LENGTH characters or less.
"
+msgstr "* For T_FIELD, enter %s2 characters or less.
"
msgid "SC_CheckError_013_SINGLE"
@@ -58,5 +58,5 @@
msgid "SC_CheckError_014"
-msgstr "* For T_FIELD, enter T_LENGTH or smaller.
"
+msgstr "* For T_FIELD, enter %s2 or smaller.
"
msgid "SC_CheckError_015_SINGLE"
@@ -78,5 +78,5 @@
msgid "SC_CheckError_020"
-msgstr "* T_FIELD must be T_LENGTH characters or less.
"
+msgstr "* T_FIELD must be %s2 characters or less.
"
msgid "SC_CheckError_021"
@@ -84,5 +84,5 @@
msgid "SC_CheckError_022"
-msgstr "* For T_FIELD, enter within a text length of T_LENGTH.
"
+msgstr "* For T_FIELD, enter within a text length of %s2.
"
msgid "SC_CheckError_023"
@@ -115,6 +115,6 @@
msgid "SC_CheckError_032_SINGLE"
msgid_plural "SC_CheckError_032_PLURAL"
-msgstr[0] "* T_FIELD must be between T_COUNT - T_DIGIT_MAX digits.
"
-msgstr[1] "* For T_FIELD, input between T_COUNT to T_DIGIT_MAX digits.
"
+msgstr[0] "* T_FIELD must be between T_COUNT - %s2 digits.
"
+msgstr[1] "* For T_FIELD, input between T_COUNT to %s2 digits.
"
msgid "SC_CheckError_033_SINGLE"
@@ -136,8 +136,8 @@
msgid "SC_CheckError_038"
-msgstr "* The format permitted for T_FIELD is T_EXT.
"
+msgstr "* The format permitted for T_FIELD is %s2.
"
msgid "SC_CheckError_039"
-msgstr "* T_PATH cannot be found.
"
+msgstr "* %s1 cannot be found.
"
msgid "SC_CheckError_040"
@@ -146,5 +146,5 @@
msgid "SC_CheckError_041"
msgstr ""
-"* For the T_FIELD file size, use a size that is T_SIZET_UNIT or less.
"
+"* For the T_FIELD file size, use a size that is %s2%s3 or less.
"
msgid "SC_CheckError_042"
@@ -162,5 +162,5 @@
msgid "SC_CheckError_046"
msgstr ""
-"* The period specification for T_START and T_END is not correct.
"
+"* The period specification for %s1 and %s2 is not correct.
"
msgid "SC_CheckError_047"
@@ -188,14 +188,14 @@
msgid "SC_FormParam_001"
-msgstr "* The file T_NAME does not exist.
"
+msgstr "* The file %s1 does not exist.
"
msgid "SC_FormParam_002"
-msgstr "* Does not support the error check format (T_FUNCTION) **
"
+msgstr "* Does not support the error check format (%s1) **
"
msgid "SC_FormParam_003"
-msgstr "T_NAME
(* Required)"
+msgstr "%s1
(* Required)"
msgid "SC_FormParam_004"
-msgstr " [Default value: T_DEFAULT]"
+msgstr " [Default value: %s1]"
msgid "SC_FormParam_005"
@@ -212,15 +212,15 @@
msgid "SC_CartSession_003"
msgstr ""
-"* Delivery preparations are not ready for T_PRODUCT. Please access the "
+"* Delivery preparations are not ready for %s1. Please access the "
"inquiry page for more details."
msgid "SC_CartSession_004"
msgstr ""
-"* There is a sale restriction (or inventory shortage) for T_PRODUCT. It is "
-"not possible to purchase a quantity that exceeds T_LIMIT in a single "
+"* There is a sale restriction (or inventory shortage) for %s1. It is "
+"not possible to purchase a quantity that exceeds %s2 in a single "
"purchase."
msgid "SC_CartSession_005"
-msgstr "* T_PRODUCT is sold out."
+msgstr "* %s1 is sold out."
msgid "SC_Fpdf_001"
@@ -273,8 +273,8 @@
msgid "SC_Fpdf_017"
-msgstr "Creation date: T_YEAR/T_MONTH/T_DAY"
+msgstr "Creation date: %s1/%s2/%s3"
msgid "SC_Fpdf_018"
-msgstr "T_LASTNAME T_FIRSTNAME"
+msgstr "%s1 %s2"
msgid "SC_Fpdf_019"
@@ -291,5 +291,5 @@
msgid "SC_Image_002"
-msgstr "Copying of T_FROM->T_TO failed."
+msgstr "Copying of %s1->%s2 failed."
msgid "SC_Image_003"
@@ -310,9 +310,9 @@
msgstr ""
"
Please grant T_CACHE_REALDIR user write access (777, etc.)"
+"align: center\">Please grant %s1 user write access (777, etc.)"
"div>"
msgid "SC_Initial_002"
-msgstr "T_CACHE_REALDIR../mtb_constants_init.php does not exist"
+msgstr "%s1../mtb_constants_init.php does not exist"
msgid "SC_PageNavi_001"
@@ -338,8 +338,8 @@
msgid "SC_SendMail_002"
-msgstr "Unknown backend.[$backend = T_BACKEND]"
+msgstr "Unknown backend.[$backend = %s1]"
msgid "SC_SendMail_003"
-msgstr "E-mail sending failed.[T_MESSAGE]"
+msgstr "E-mail sending failed.[%s1]"
msgid "SC_View_001"
@@ -347,9 +347,9 @@
msgid "SC_UploadFile_001"
-msgstr "* T_DISPNAME is not uploaded.
"
+msgstr "* %s1 is not uploaded.
"
msgid "SC_UploadFile_002"
msgstr ""
-"* T_DISPNAME is not uploaded. (If you cannot upload the file, adjust "
+"* %s1 is not uploaded. (If you cannot upload the file, adjust "
"php_value upload_max_filesize for the .htaccess file)
"
@@ -420,5 +420,5 @@
msgid "SC_Helper_Mail_001"
-msgstr "No order exists. (Order number: T_ORDER_ID)"
+msgstr "No order exists. (Order number: %s1)"
msgid "SC_Helper_Mail_002"
@@ -1934,5 +1934,5 @@
msgid "FORMAT_NAME_FULL_SIR"
-msgstr "T_LASTNAME T_FIRSTNAME"
+msgstr "%s1 %s2"
msgid "LC_Page_Abouts_001"
Index: /branches/version-2_12-multilang/data/class/SC_UploadFile.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_UploadFile.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_UploadFile.php (revision 22435)
@@ -96,5 +96,5 @@
if (!($_FILES[$keyname]['size'] > 0)) {
- $objErr->arrErr[$keyname] = t('SC_UploadFile_001', array('T_DISPNAME' => $this->disp_name[$arrKeyname[$keyname]]));
+ $objErr->arrErr[$keyname] = t('SC_UploadFile_001', array('%s1' => $this->disp_name[$arrKeyname[$keyname]]));
} else {
foreach ($this->keyname as $val) {
@@ -142,5 +142,5 @@
$arrKeyname = array_flip($this->keyname);
if (!($_FILES[$keyname]['size'] > 0)) {
- $objErr->arrErr[$keyname] = t('SC_UploadFile_002', array('T_DISPNAME' => $this->disp_name[$arrKeyname[$keyname]]));
+ $objErr->arrErr[$keyname] = t('SC_UploadFile_002', array('%s1' => $this->disp_name[$arrKeyname[$keyname]]));
} else {
foreach ($this->keyname as $val) {
@@ -457,5 +457,5 @@
&& $this->temp_file[$cnt] == ''
) {
- $arrRet[$val] = t('SC_UploadFile_001', array('T_DISPNAME' => $this->disp_name[$cnt]));
+ $arrRet[$val] = t('SC_UploadFile_001', array('%s1' => $this->disp_name[$cnt]));
}
}
Index: /branches/version-2_12-multilang/data/class/SC_CheckError.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_CheckError.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_CheckError.php (revision 22435)
@@ -71,5 +71,5 @@
$html_diff_tag_list = implode(', ', $arrDiffTag);
- $this->arrErr[$value[1]] = t('SC_CheckError_001', array('T_FIELD' => $value[0], 'T_TAG' => $html_diff_tag_list));
+ $this->arrErr[$value[1]] = t('SC_CheckError_001', array('T_FIELD' => $value[0], '%s2' => $html_diff_tag_list));
}
@@ -240,5 +240,5 @@
// 文字数の取得
if (mb_strlen($this->arrParam[$value[1]]) > $value[2]) {
- $this->arrErr[$value[1]] = t('SC_CheckError_012', array('T_FIELD' => $value[0], 'T_LENGTH' => $value[2]));
+ $this->arrErr[$value[1]] = t('SC_CheckError_012', array('T_FIELD' => $value[0], '%s2' => $value[2]));
}
}
@@ -276,5 +276,5 @@
// 文字数の取得
if ($this->arrParam[$value[1]] > $value[2]) {
- $this->arrErr[$value[1]] = t('SC_CheckError_014', array('T_FIELD' => $value[0], 'T_LENGTH' => $value[2]));
+ $this->arrErr[$value[1]] = t('SC_CheckError_014', array('T_FIELD' => $value[0], '%s2' => $value[2]));
}
}
@@ -378,5 +378,5 @@
for ($i = 1; $i <= 3; $i++) {
if (strlen($this->arrParam[$value[$i]]) > 0 && strlen($this->arrParam[$value[$i]]) > $telItemLen) {
- $this->arrErr[$value[$i]] .= t('SC_CheckError_020', array('T_FIELD' => $value[0] . $i, 'T_LENGTH' => $telItemLen));
+ $this->arrErr[$value[$i]] .= t('SC_CheckError_020', array('T_FIELD' => $value[0] . $i, '%s2' => $telItemLen));
} else if ($this->numelicCheck($this->arrParam[$value[1]])) {
$this->arrErr[$value[$i]] .= t('SC_CheckError_021', array('T_FIELD' => $value[0] . $i));
@@ -387,5 +387,5 @@
// 合計値チェック
if ($total_count > $telLen) {
- $this->arrErr[$value[3]] .= t('SC_CheckError_022', array('T_FIELD' => $value[0], 'T_LENGTH' => $telLen));
+ $this->arrErr[$value[3]] .= t('SC_CheckError_022', array('T_FIELD' => $value[0], '%s2' => $telLen));
}
}
@@ -585,5 +585,5 @@
$count = strlen($this->arrParam[$value[1]]);
if (($count > 0) && $value[2] > $count || $value[3] < $count) {
- $this->arrErr[$value[1]] = t_plural($value[2], 'SC_CheckError_032_SINGLE', 'SC_CheckError_032_PLURAL', array('T_FIELD' => $value[0], 'T_DIGIT_MAX' => $value[3]));
+ $this->arrErr[$value[1]] = t_plural($value[2], 'SC_CheckError_032_SINGLE', 'SC_CheckError_032_PLURAL', array('T_FIELD' => $value[0], '%s2' => $value[3]));
}
}
@@ -726,5 +726,5 @@
if ($match === false) {
$str_ext = implode('・', $value[2]);
- $this->arrErr[$value[1]] = t('SC_CheckError_038', array('T_FIELD' => $value[0], 'T_EXT' => $str_ext));
+ $this->arrErr[$value[1]] = t('SC_CheckError_038', array('T_FIELD' => $value[0], '%s2' => $str_ext));
}
}
@@ -749,5 +749,5 @@
if ($this->arrParam[$value[1]] != '' && !file_exists($path)) {
- $this->arrErr[$value[1]] = t('SC_CheckError_039', array('T_PATH' => $path));
+ $this->arrErr[$value[1]] = t('SC_CheckError_039', array('%s1' => $path));
}
}
@@ -780,5 +780,5 @@
$byte = 'MB';
}
- $this->arrErr[$value[1]] = t('SC_CheckError_041', array('T_FIELD' => $value[0], 'T_SIZE' => $value[2], 'T_UNIT' => $byte));
+ $this->arrErr[$value[1]] = t('SC_CheckError_041', array('T_FIELD' => $value[0], '%s2' => $value[2], '%s3' => $byte));
}
}
@@ -943,5 +943,5 @@
if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[5]] == '') && $date1 > $date2) {
- $this->arrErr[$value[2]] = t('SC_CheckError_046', array('T_START' => $value[0], 'T_END' => $value[1]));
+ $this->arrErr[$value[2]] = t('SC_CheckError_046', array('%s1' => $value[0], '%s2' => $value[1]));
}
}
@@ -993,8 +993,8 @@
if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[8]] == '') && $date1 > $date2) {
- $this->arrErr[$value[2]] = t('SC_CheckError_046', array('T_START' => $value[0], 'T_END' => $value[1]));
+ $this->arrErr[$value[2]] = t('SC_CheckError_046', array('%s1' => $value[0], '%s2' => $value[1]));
}
if ($date1 == $date2) {
- $this->arrErr[$value[2]] = t('SC_CheckError_046', array('T_START' => $value[0], 'T_END' => $value[1]));
+ $this->arrErr[$value[2]] = t('SC_CheckError_046', array('%s1' => $value[0], '%s2' => $value[1]));
}
@@ -1036,5 +1036,5 @@
if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[5]] == '') && $date1 > $date2) {
- $this->arrErr[$value[2]] = t('SC_CheckError_046', array('T_START' => $value[0], 'T_END' => $value[1]));
+ $this->arrErr[$value[2]] = t('SC_CheckError_046', array('%s1' => $value[0], '%s2' => $value[1]));
}
}
Index: /branches/version-2_12-multilang/data/class/SC_Initial.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_Initial.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_Initial.php (revision 22435)
@@ -190,5 +190,5 @@
$mtb_constants = file_get_contents(CACHE_REALDIR . '../mtb_constants_init.php');
- $errorMessage = t('SC_Initial_001', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('device_type_id' => FALSE));
+ $errorMessage = t('SC_Initial_001', array('%s1' => CACHE_REALDIR), array('device_type_id' => FALSE));
if (is_writable(CACHE_REALDIR)) {
$handle = fopen(CACHE_REALDIR . 'mtb_constants.php', 'w');
@@ -206,5 +206,5 @@
}
} else {
- die(t('SC_Initial_002', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('device_type_id' => FALSE)));
+ die(t('SC_Initial_002', array('%s1' => CACHE_REALDIR), array('device_type_id' => FALSE)));
}
}
Index: /branches/version-2_12-multilang/data/class/SC_SendMail.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_SendMail.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_SendMail.php (revision 22435)
@@ -280,5 +280,5 @@
if (PEAR::isError($result)) {
// XXX Windows 環境では SJIS でメッセージを受け取るようなので変換する。
- $tokens = array('T_MESSAGE' => mb_convert_encoding($result->getMessage(), CHAR_CODE, 'auto'));
+ $tokens = array('%s1' => mb_convert_encoding($result->getMessage(), CHAR_CODE, 'auto'));
$msg = t('SC_SendMail_003', $tokens);
trigger_error($msg, E_USER_WARNING);
@@ -333,5 +333,5 @@
default:
- trigger_error(t('SC_SendMail_002', array('T_BACKEND' => var_export($backend, true))), E_USER_ERROR);
+ trigger_error(t('SC_SendMail_002', array('%s1' => var_export($backend, true))), E_USER_ERROR);
exit;
}
Index: /branches/version-2_12-multilang/data/class/SC_CartSession.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_CartSession.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_CartSession.php (revision 22435)
@@ -534,5 +534,5 @@
$arrDeliv = SC_Helper_Purchase_Ex::getDeliv($productTypeId);
if (SC_Utils_Ex::isBlank($arrDeliv)) {
- $tpl_message .= t('SC_CartSession_003', array('T_PRODUCT' => $product['name']));
+ $tpl_message .= t('SC_CartSession_003', array('%s1' => $product['name']));
$this->delProduct($arrItem['cart_no'], $productTypeId);
}
@@ -547,8 +547,8 @@
$total_inctax = SC_Helper_DB_Ex::sfCalcIncTax($arrItem['price']) * $limit;
$this->setProductValue($arrItem['id'], 'total_inctax', $total_inctax, $productTypeId);
- $tpl_message .= t('SC_CartSession_004', array('T_PRODUCT' => $product['name'], 'T_LIMIT' => $limit));
+ $tpl_message .= t('SC_CartSession_004', array('%s1' => $product['name'], '%s2' => $limit));
} else {
$this->delProduct($arrItem['cart_no'], $productTypeId);
- $tpl_message .= t('SC_CartSession_005', array('T_PRODUCT' => $product['name']));
+ $tpl_message .= t('SC_CartSession_005', array('%s1' => $product['name']));
continue;
}
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php (revision 22435)
@@ -127,5 +127,5 @@
if (empty($arrOrder)) {
- trigger_error(t('SC_Helper_Mail_001', array('T_ORDER_ID' => $order_id)), E_USER_ERROR);
+ trigger_error(t('SC_Helper_Mail_001', array('%s1' => $order_id)), E_USER_ERROR);
}
@@ -200,5 +200,5 @@
$objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
- $objSendMail->setTo($arrOrder['order_email'], t('FORMAT_NAME_FULL_SIR', array('T_LASTNAME' => $arrOrder['order_name01'], 'T_FIRSTNAME' => $arrOrder['order_name02'])));
+ $objSendMail->setTo($arrOrder['order_email'], t('FORMAT_NAME_FULL_SIR', array('%s1' => $arrOrder['order_name01'], '%s2' => $arrOrder['order_name02'])));
// 送信フラグ:trueの場合は、送信する。
@@ -359,5 +359,5 @@
$to_addr = $arrCustomerData['email'];
}
- $objMail->setTo($to_addr, t('FORMAT_NAME_FULL_SIR', array('T_LASTNAME' => $arrCustomerData['name01'], 'T_FIRSTNAME' => $arrCustomerData['name02'])));
+ $objMail->setTo($to_addr, t('FORMAT_NAME_FULL_SIR', array('%s1' => $arrCustomerData['name01'], '%s2' => $arrCustomerData['name02'])));
$objMail->sendMail();
Index: /branches/version-2_12-multilang/data/class/SC_Fpdf.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_Fpdf.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_Fpdf.php (revision 22435)
@@ -137,7 +137,7 @@
$this->lfText(27, 78, $this->arrData['msg3'], 8); //メッセージ3
$tokens = array(
- 'T_YEAR' => $this->arrData['year'],
- 'T_MONTH' => $this->arrData['month'],
- 'T_DAY' => $this->arrData['day']
+ '%s1' => $this->arrData['year'],
+ '%s2' => $this->arrData['month'],
+ '%s3' => $this->arrData['day']
);
$text = t('SC_Fpdf_017', $tokens);
@@ -157,5 +157,5 @@
$this->lfText(27, 47, $text, 10); //購入者都道府県+住所1
$this->lfText(27, 51, $this->arrDisp['order_addr02'], 10); //購入者住所2
- $text = t('SC_Fpdf_018', array('T_LASTNAME' => $this->arrDisp['order_name01'], 'T_FIRSTNAME' => $this->arrDisp['order_name02']));
+ $text = t('SC_Fpdf_018', array('%s1' => $this->arrDisp['order_name01'], '%s2' => $this->arrDisp['order_name02']));
$this->lfText(27, 59, $text, 11); //購入者氏名
Index: /branches/version-2_12-multilang/data/class/SC_FormParam.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_FormParam.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_FormParam.php (revision 22435)
@@ -131,10 +131,10 @@
if ($find) {
- $this->html_disp_name[$index] = t('SC_FormParam_003', array('T_NAME' => $this->disp_name[$index]));
+ $this->html_disp_name[$index] = t('SC_FormParam_003', array('%s1' => $this->disp_name[$index]));
} else {
$this->html_disp_name[$index] = $this->disp_name[$index];
}
if ($this->arrDefault[$key] != '') {
- $this->html_disp_name[$index] .= t('SC_FormParam_004', array('T_DEFAULT' => $this->arrDefault[$key]));
+ $this->html_disp_name[$index] .= t('SC_FormParam_004', array('%s1' => $this->arrDefault[$key]));
}
if ($this->input_db[$index] == false) {
@@ -228,5 +228,5 @@
case 'FILE_EXISTS':
if ($value != '' && !file_exists($this->check_dir . $value)) {
- $arrErr[$key] = t('SC_FormParam_001', array('T_NAME' => $this->disp_name[$index]));
+ $arrErr[$key] = t('SC_FormParam_001', array('%s1' => $this->disp_name[$index]));
}
break;
@@ -234,9 +234,9 @@
case 'DOWN_FILE_EXISTS':
if ($value != '' && !file_exists(DOWN_SAVE_REALDIR . $value)) {
- $arrErr[$key] = t('SC_FormParam_001', array('T_NAME' => $this->disp_name[$index]));
+ $arrErr[$key] = t('SC_FormParam_001', array('%s1' => $this->disp_name[$index]));
}
break;
default:
- $arrErr[$key] = t('SC_FormParam_002', array('T_FUNCTION' => $func));
+ $arrErr[$key] = t('SC_FormParam_002', array('%s1' => $func));
break;
}
Index: /branches/version-2_12-multilang/data/class/SC_Image.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_Image.php (revision 22433)
+++ /branches/version-2_12-multilang/data/class/SC_Image.php (revision 22435)
@@ -54,6 +54,6 @@
} else {
$tokens = array(
- 'T_FROM' => $from_path,
- 'T_TO' => $to_path
+ '%s1' => $from_path,
+ '%s2' => $to_path
);
GC_Utils_Ex::gfDebugLog(t('SC_Image_002', $tokens));