Changeset 21719 for branches/version-2_12-dev/data/class

Timestamp:

2012/04/09 04:32:30 (12 years ago)

Author:

Seasoft

Message:

#1431 (用語の揺れ)

• 所在地

#1613 (typo修正・ソース整形・ソースコメントの改善)

Location:

branches/version-2_12-dev/data/class

Files:

• SC_Fpdf.php (modified) (1 diff)
• pages/admin/basis/LC_Page_Admin_Basis.php (modified) (1 diff)
• pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (modified) (1 diff)

branches/version-2_12-dev/data/class/SC_Fpdf.php

@@ -104 +104 @@
         $arrInfo = $objDb->sfGetBasisData();
 
-        $this->lfText(125, 60, $arrInfo['shop_name'], 8, 'B');          //ショップ名
-        $this->lfText(125, 63, $arrInfo['law_url'], 8);          //URL
-        $this->lfText(125, 68, $arrInfo['law_company'], 8);        //会社名
-        $text = '〒 '.$arrInfo['law_zip01'].' - '.$arrInfo['law_zip02'];
-        $this->lfText(125, 71, $text, 8);  //郵便番号
-        $text = $this->arrPref[$arrInfo['law_pref']].$arrInfo['law_addr01'];
-        $this->lfText(125, 74, $text, 8);  //都道府県+住所1
-        $this->lfText(125, 77, $arrInfo['law_addr02'], 8);          //住所2
+        // ショップ名
+        $this->lfText(125, 60, $arrInfo['shop_name'], 8, 'B');
+        // URL
+        $this->lfText(125, 63, $arrInfo['law_url'], 8);
+        // 会社名
+        $this->lfText(125, 68, $arrInfo['law_company'], 8);
+        // 郵便番号
+        $text = '〒 ' . $arrInfo['law_zip01'] . ' - ' . $arrInfo['law_zip02'];
+        $this->lfText(125, 71, $text, 8);
+        // 都道府県+所在地
+        $text = $this->arrPref[$arrInfo['law_pref']] . $arrInfo['law_addr01'];
+        $this->lfText(125, 74, $text, 8);
+        $this->lfText(125, 77, $arrInfo['law_addr02'], 8);
 
         $text = 'TEL: '.$arrInfo['law_tel01'].'-'.$arrInfo['law_tel02'].'-'.$arrInfo['law_tel03'];

branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

@@ -227 +227 @@
         $objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK'));
         $objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK'));
-        // 住所チェック
+        // 所在地チェック
         $objFormParam->addParam('都道府県', 'pref', '', 'n', array('EXIST_CHECK'));
-        $objFormParam->addParam('住所1', 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('住所2', 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('所在地1', 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('所在地2', 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         // メールチェック
         $objFormParam->addParam('商品注文受付メールアドレス', 'email01', null, 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));

branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php

@@ -134 +134 @@
         $objFormParam->addParam('郵便番号2', 'law_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam('都道府県', 'law_pref', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('住所1', 'law_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('住所2', 'law_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('所在地1', 'law_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('所在地2', 'law_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('電話番号1', 'law_tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK'));
         $objFormParam->addParam('電話番号2', 'law_tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK'));