Index: /branches/version-2_12-multilang/html/install/index.php
===================================================================
--- /branches/version-2_12-multilang/html/install/index.php (revision 22428)
+++ /branches/version-2_12-multilang/html/install/index.php (revision 22429)
@@ -737,5 +737,5 @@
$objDBParam->addParam(t('LC_Page_Install_033'), 'db_type', INT_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'), $db_type);
- $objDBParam->addParam(t('LC_Page_Install_034'), 'db_server', MTEXT_LEN, '', array('MAX_LENGTH_CHECK'), $db_server);
+ $objDBParam->addParam(t('c_DB server_01'), 'db_server', MTEXT_LEN, '', array('MAX_LENGTH_CHECK'), $db_server);
$objDBParam->addParam(t('LC_Page_Install_035'), 'db_port', INT_LEN, '', array('MAX_LENGTH_CHECK'), $db_port);
$objDBParam->addParam(t('LC_Page_Install_036'), 'db_name', MTEXT_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'), $db_name);
Index: /branches/version-2_12-multilang/data/locales/en-US.po
===================================================================
--- /branches/version-2_12-multilang/data/locales/en-US.po (revision 22428)
+++ /branches/version-2_12-multilang/data/locales/en-US.po (revision 22429)
@@ -2341,7 +2341,4 @@
msgstr "DB type"
-msgid "LC_Page_Install_034"
-msgstr "DB server"
-
msgid "LC_Page_Install_035"
msgstr "DB port"
@@ -3268,83 +3265,80 @@
msgstr "Parameter settings"
-msgid "LC_Page_Admin_System_System_001"
+msgid "c_System information_01"
msgstr "System information"
-msgid "LC_Page_Admin_System_System_002"
+msgid "c_EC-CUBE_01"
msgstr "EC-CUBE"
-msgid "LC_Page_Admin_System_System_003"
+msgid "c_Server OS_01"
msgstr "Server OS"
-msgid "LC_Page_Admin_System_System_004"
+msgid "c_DB server_01"
msgstr "DB server"
-msgid "LC_Page_Admin_System_System_005"
+msgid "c_WEB server_01"
msgstr "WEB server"
-msgid "LC_Page_Admin_System_System_006"
+msgid "c_Enabled_01"
msgstr "Enabled"
-msgid "LC_Page_Admin_System_System_007"
+msgid "c_Inactive_01"
msgstr "Inactive"
-msgid "LC_Page_Admin_System_System_008"
+msgid "c_GD_01"
msgstr "GD"
-msgid "LC_Page_Admin_System_System_009"
+msgid "c_HTTP user agent_01"
msgstr "HTTP user agent"
-msgid "LC_Page_Admin_Total_001"
+msgid "c_Sales by period_01"
msgstr "Sales by period"
-msgid "LC_Page_Admin_Total_002"
-msgstr "Sales by period"
-
-msgid "LC_Page_Admin_Total_003"
+msgid "c_Sales by product_01"
msgstr "Sales by product"
-msgid "LC_Page_Admin_Total_004"
+msgid "c_Sales by age group_01"
msgstr "Sales by age group"
-msgid "LC_Page_Admin_Total_005"
+msgid "c_Sales by occupation_01"
msgstr "Sales by occupation"
-msgid "LC_Page_Admin_Total_006"
+msgid "c_Sales by member_01"
msgstr "Sales by member"
-msgid "LC_Page_Admin_Total_007"
+msgid "c_T_FIELD1/T_FIELD2/T_FIELD3_01"
msgstr "T_FIELD1/T_FIELD2/T_FIELD3"
-msgid "LC_Page_Admin_Total_008"
+msgid "c_Sales period: T_FIELD1 - T_FIELD2_01"
msgstr "Sales period: T_FIELD1 - T_FIELD2"
-msgid "LC_Page_Admin_Total_010"
+msgid "c_Non-member_01"
msgstr "Non-member"
-msgid "LC_Page_Admin_Total_011"
+msgid "c_Not answered_01"
msgstr "Not answered"
-msgid "LC_Page_Admin_Total_012"
+msgid "c_T_FIELDs_01"
msgstr "T_FIELD's"
-msgid "LC_Page_Admin_Total_013"
+msgid "c_(Age)_01"
msgstr "(Age)"
-msgid "LC_Page_Admin_Total_014"
+msgid "c_(Total sales)_01"
msgstr "(Total sales)"
-msgid "LC_Page_Admin_Total_015"
+msgid "c_(By month)_01"
msgstr "(By month)"
-msgid "LC_Page_Admin_Total_016"
+msgid "c_(By year)_01"
msgstr "(By year)"
-msgid "LC_Page_Admin_Total_017"
+msgid "c_(By day)_01"
msgstr "(By day)"
-msgid "LC_Page_Admin_Total_018"
+msgid "c_(By time)_01"
msgstr "(By time)"
-msgid "LC_Page_Admin_Total_019"
+msgid "c_(By date)_01"
msgstr "(By date)"
Index: /branches/version-2_12-multilang/data/locales/ja.po
===================================================================
--- /branches/version-2_12-multilang/data/locales/ja.po (revision 22428)
+++ /branches/version-2_12-multilang/data/locales/ja.po (revision 22429)
@@ -2326,7 +2326,4 @@
msgstr "DBの種類"
-msgid "LC_Page_Install_034"
-msgstr "DBサーバー"
-
msgid "LC_Page_Install_035"
msgstr "DBポート"
@@ -3233,83 +3230,80 @@
msgstr "パラメーター設定"
-msgid "LC_Page_Admin_System_System_001"
+msgid "c_System information_01"
msgstr "システム情報"
-msgid "LC_Page_Admin_System_System_002"
+msgid "c_EC-CUBE_01"
msgstr "EC-CUBE"
-msgid "LC_Page_Admin_System_System_003"
+msgid "c_Server OS_01"
msgstr "サーバーOS"
-msgid "LC_Page_Admin_System_System_004"
+msgid "c_DB server_01"
msgstr "DBサーバー"
-msgid "LC_Page_Admin_System_System_005"
+msgid "c_WEB server_01"
msgstr "WEBサーバー"
-msgid "LC_Page_Admin_System_System_006"
+msgid "c_Enabled_01"
msgstr "有効"
-msgid "LC_Page_Admin_System_System_007"
+msgid "c_Inactive_01"
msgstr "無効"
-msgid "LC_Page_Admin_System_System_008"
+msgid "c_GD_01"
msgstr "GD"
-msgid "LC_Page_Admin_System_System_009"
+msgid "c_HTTP user agent_01"
msgstr "HTTPユーザーエージェント"
-msgid "LC_Page_Admin_Total_001"
+msgid "c_Sales by period_01"
msgstr "期間別集計"
-msgid "LC_Page_Admin_Total_002"
-msgstr "期間別集計"
-
-msgid "LC_Page_Admin_Total_003"
+msgid "c_Sales by product_01"
msgstr "商品別集計"
-msgid "LC_Page_Admin_Total_004"
+msgid "c_Sales by age group_01"
msgstr "年代別集計"
-msgid "LC_Page_Admin_Total_005"
+msgid "c_Sales by occupation_01"
msgstr "職業別集計"
-msgid "LC_Page_Admin_Total_006"
+msgid "c_Sales by member_01"
msgstr "会員別集計"
-msgid "LC_Page_Admin_Total_007"
+msgid "c_T_FIELD1/T_FIELD2/T_FIELD3_01"
msgstr "T_FIELD1年T_FIELD2月T_FIELD3日'"
-msgid "LC_Page_Admin_Total_008"
+msgid "c_Sales period: T_FIELD1 - T_FIELD2_01"
msgstr "集計期間:T_FIELD1 - T_FIELD2"
-msgid "LC_Page_Admin_Total_010"
+msgid "c_Non-member_01"
msgstr "非会員"
-msgid "LC_Page_Admin_Total_011"
+msgid "c_Not answered_01"
msgstr "未回答"
-msgid "LC_Page_Admin_Total_012"
+msgid "c_T_FIELDs_01"
msgstr "T_FIELD代'"
-msgid "LC_Page_Admin_Total_013"
+msgid "c_(Age)_01"
msgstr "(年齢)"
-msgid "LC_Page_Admin_Total_014"
+msgid "c_(Total sales)_01"
msgstr "(売上合計)"
-msgid "LC_Page_Admin_Total_015"
+msgid "c_(By month)_01"
msgstr "(月別)"
-msgid "LC_Page_Admin_Total_016"
+msgid "c_(By year)_01"
msgstr "(年別)"
-msgid "LC_Page_Admin_Total_017"
+msgid "c_(By day)_01"
msgstr "(曜日別)"
-msgid "LC_Page_Admin_Total_018"
+msgid "c_(By time)_01"
msgstr "(時間別)"
-msgid "LC_Page_Admin_Total_019"
+msgid "c_(By date)_01"
msgstr "(日別)"
Index: /branches/version-2_12-multilang/data/class/pages/admin/total/LC_Page_Admin_Total.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 22425)
+++ /branches/version-2_12-multilang/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 22429)
@@ -65,10 +65,10 @@
// ページタイトル todo あとでなおす
- $this->arrTitle[''] = t('LC_Page_Admin_Total_001');
- $this->arrTitle['term'] = t('LC_Page_Admin_Total_002');
- $this->arrTitle['products'] = t('LC_Page_Admin_Total_003');
- $this->arrTitle['age'] = t('LC_Page_Admin_Total_004');
- $this->arrTitle['job'] = t('LC_Page_Admin_Total_005');
- $this->arrTitle['member'] = t('LC_Page_Admin_Total_006');
+ $this->arrTitle[''] = t('c_Sales by period_01');
+ $this->arrTitle['term'] = t('c_Sales by period_01');
+ $this->arrTitle['products'] = t('c_Sales by product_01');
+ $this->arrTitle['age'] = t('c_Sales by age group_01');
+ $this->arrTitle['job'] = t('c_Sales by occupation_01');
+ $this->arrTitle['member'] = t('c_Sales by member_01');
// 月度集計のkey名
@@ -335,7 +335,7 @@
list($sy, $sm, $sd) = preg_split('|[/ ]|' , $sdate);
list($ey, $em, $ed) = preg_split('|[/ ]|' , $edate);
- $start_date = t('LC_Page_Admin_Total_007', array('T_FIELD1' => $sy, 'T_FIELD2' => $sm, 'T_FIELD3' => $sd));
- $end_date = t('LC_Page_Admin_Total_007', array('T_FIELD1' => $ey, 'T_FIELD2' => $em, 'T_FIELD3' => $ed));
- $objGraphLine->drawTitle(t('LC_Page_Admin_Total_008', array('T_FIELD1' => $start_date, 'T_FIELD2' => $end_date)));
+ $start_date = t('c_T_FIELD1/T_FIELD2/T_FIELD3_01', array('T_FIELD1' => $sy, 'T_FIELD2' => $sm, 'T_FIELD3' => $sd));
+ $end_date = t('c_T_FIELD1/T_FIELD2/T_FIELD3_01', array('T_FIELD1' => $ey, 'T_FIELD2' => $em, 'T_FIELD3' => $ed));
+ $objGraphLine->drawTitle(t('c_Sales period: T_FIELD1 - T_FIELD2_01', array('T_FIELD1' => $start_date, 'T_FIELD2' => $end_date)));
// グラフ描画
@@ -379,8 +379,8 @@
list($sy, $sm, $sd) = preg_split('|[/ ]|' , $sdate);
list($ey, $em, $ed) = preg_split('|[/ ]|' , $edate);
- $start_date = t('LC_Page_Admin_Total_007', array('T_FIELD1' => $sy, 'T_FIELD2' => $sm, 'T_FIELD3' => $sd));
- $end_date = t('LC_Page_Admin_Total_007', array('T_FIELD1' => $ey, 'T_FIELD2' => $em, 'T_FIELD3' => $ed));
+ $start_date = t('c_T_FIELD1/T_FIELD2/T_FIELD3_01', array('T_FIELD1' => $sy, 'T_FIELD2' => $sm, 'T_FIELD3' => $sd));
+ $end_date = t('c_T_FIELD1/T_FIELD2/T_FIELD3_01', array('T_FIELD1' => $ey, 'T_FIELD2' => $em, 'T_FIELD3' => $ed));
- $objGraphPie->drawTitle(t('LC_Page_Admin_Total_008', array('T_FIELD1' => $start_date, 'T_FIELD2' => $end_date)));
+ $objGraphPie->drawTitle(t('c_Sales period: T_FIELD1 - T_FIELD2_01', array('T_FIELD1' => $start_date, 'T_FIELD2' => $end_date)));
// 円グラフ描画
@@ -428,7 +428,7 @@
list($sy, $sm, $sd) = preg_split('|[/ ]|' , $sdate);
list($ey, $em, $ed) = preg_split('|[/ ]|' , $edate);
- $start_date = t('LC_Page_Admin_Total_007', array('T_FIELD1' => $sy, 'T_FIELD2' => $sm, 'T_FIELD3' => $sd));
- $end_date = t('LC_Page_Admin_Total_007', array('T_FIELD1' => $ey, 'T_FIELD2' => $em, 'T_FIELD3' => $ed));
- $objGraphBar->drawTitle(t('LC_Page_Admin_Total_008', array('T_FIELD1' => $start_date, 'T_FIELD2' => $end_date)));
+ $start_date = t('c_T_FIELD1/T_FIELD2/T_FIELD3_01', array('T_FIELD1' => $sy, 'T_FIELD2' => $sm, 'T_FIELD3' => $sd));
+ $end_date = t('c_T_FIELD1/T_FIELD2/T_FIELD3_01', array('T_FIELD1' => $ey, 'T_FIELD2' => $em, 'T_FIELD3' => $ed));
+ $objGraphBar->drawTitle(t('c_Sales period: T_FIELD1 - T_FIELD2_01', array('T_FIELD1' => $start_date, 'T_FIELD2' => $end_date)));
$objGraphBar->drawGraph();
@@ -529,7 +529,7 @@
$member_key = $arrResult['order_sex'];
if ($member_key != '') {
- $arrResult['member_name'] = (($arrResult['member']) ? t('c_Member_01') : t('LC_Page_Admin_Total_010')) . $this->arrSex[$member_key];
+ $arrResult['member_name'] = (($arrResult['member']) ? t('c_Member_01') : t('c_Non-member_01')) . $this->arrSex[$member_key];
} else {
- $arrResult['member_name'] = t('LC_Page_Admin_Total_011');
+ $arrResult['member_name'] = t('c_Not answered_01');
}
}
@@ -604,5 +604,5 @@
$arrResult['job_name'] = $this->arrJob[$job_key];
} else {
- $arrResult['job_name'] = t('LC_Page_Admin_Total_011');
+ $arrResult['job_name'] = t('c_Not answered_01');
}
@@ -639,11 +639,11 @@
$age_key = $arrResult['age'];
if ($age_key != '') {
- $arrResult['age_name'] = t('LC_Page_Admin_Total_012', array('T_FIELD' => $arrResult['age']));
+ $arrResult['age_name'] = t('c_T_FIELDs_01', array('T_FIELD' => $arrResult['age']));
} else {
- $arrResult['age_name'] = t('LC_Page_Admin_Total_011');
- }
-
- }
- $tpl_image = $this->lfGetGraphBar($arrTotalResults, 'age_name', 'age_' . $type, t('LC_Page_Admin_Total_013'), t('LC_Page_Admin_Total_014'), $sdate, $edate);
+ $arrResult['age_name'] = t('c_Not answered_01');
+ }
+
+ }
+ $tpl_image = $this->lfGetGraphBar($arrTotalResults, 'age_name', 'age_' . $type, t('c_(Age)_01'), t('c_(Total sales)_01'), $sdate, $edate);
return array($arrTotalResults, $tpl_image);
@@ -661,26 +661,26 @@
switch ($type) {
case 'month':
- $xtitle = t('LC_Page_Admin_Total_015');
- $ytitle = t('LC_Page_Admin_Total_014');
+ $xtitle = t('c_(By month)_01');
+ $ytitle = t('c_(Total sales)_01');
$format = '%m';
break;
case 'year':
- $xtitle = t('LC_Page_Admin_Total_016');
- $ytitle = t('LC_Page_Admin_Total_014');
+ $xtitle = t('c_(By year)_01');
+ $ytitle = t('c_(Total sales)_01');
$format = '%Y';
break;
case 'wday':
- $xtitle = t('LC_Page_Admin_Total_017');
- $ytitle = t('LC_Page_Admin_Total_014');
+ $xtitle = t('c_(By day)_01');
+ $ytitle = t('c_(Total sales)_01');
$format = '%a';
break;
case 'hour':
- $xtitle = t('LC_Page_Admin_Total_018');
- $ytitle = t('LC_Page_Admin_Total_014');
+ $xtitle = t('c_(By time)_01');
+ $ytitle = t('c_(Total sales)_01');
$format = '%H';
break;
default:
- $xtitle = t('LC_Page_Admin_Total_019');
- $ytitle = t('LC_Page_Admin_Total_014');
+ $xtitle = t('c_(By date)_01');
+ $ytitle = t('c_(Total sales)_01');
$format = '%Y-%m-%d';
$xincline = true;
Index: /branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_System.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_System.php (revision 22100)
+++ /branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_System.php (revision 22429)
@@ -48,5 +48,5 @@
$this->tpl_mainno = 'system';
$this->tpl_maintitle = t('TPL_MAINTITLE_009');
- $this->tpl_subtitle = t('LC_Page_Admin_System_System_001');
+ $this->tpl_subtitle = t('c_System information_01');
}
@@ -117,8 +117,8 @@
$arrSystemInfo = array(
- array('title' => t('LC_Page_Admin_System_System_002'), 'value' => ECCUBE_VERSION),
- array('title' => t('LC_Page_Admin_System_System_003'), 'value' => php_uname()),
- array('title' => t('LC_Page_Admin_System_System_004'), 'value' => $objDB->sfGetDBVersion()),
- array('title' => t('LC_Page_Admin_System_System_005'), 'value' => $_SERVER['SERVER_SOFTWARE']),
+ array('title' => t('c_EC-CUBE_01'), 'value' => ECCUBE_VERSION),
+ array('title' => t('c_Server OS_01'), 'value' => php_uname()),
+ array('title' => t('c_DB server_01'), 'value' => $objDB->sfGetDBVersion()),
+ array('title' => t('c_WEB server_01'), 'value' => $_SERVER['SERVER_SOFTWARE']),
);
@@ -131,10 +131,10 @@
$arrValue[] = "$key => $val";
}
- $value = t('LC_Page_Admin_System_System_006') . ' (' . implode(', ', $arrValue) . ')';
+ $value = t('c_Enabled_01') . ' (' . implode(', ', $arrValue) . ')';
} else {
- $value = t('LC_Page_Admin_System_System_007');
+ $value = t('c_Inactive_01');
}
- $arrSystemInfo[] = array('title' => t('LC_Page_Admin_System_System_008'), 'value' => $value);
- $arrSystemInfo[] = array('title' => t('LC_Page_Admin_System_System_009'), 'value' => $_SERVER['HTTP_USER_AGENT']);
+ $arrSystemInfo[] = array('title' => t('c_GD_01'), 'value' => $value);
+ $arrSystemInfo[] = array('title' => t('c_HTTP user agent_01'), 'value' => $_SERVER['HTTP_USER_AGENT']);
return $arrSystemInfo;