Ignore:
Timestamp:
2013/01/31 18:39:05 (11 years ago)
Author:
m_uehara
Message:

#2084 r22432 - r22433 の逆マージを行いました。

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php

    r22453 r22489  
    127127 
    128128        if (empty($arrOrder)) { 
    129             trigger_error(t('SC_Helper_Mail_001', array('T_ARG1' => $order_id)), E_USER_ERROR); 
     129            trigger_error(t('c_No order exists. (Order number: T_ORDER_ID)_01', array('T_ORDER_ID' => $order_id)), E_USER_ERROR); 
    130130        } 
    131131 
     
    200200 
    201201        $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc); 
    202         $objSendMail->setTo($arrOrder['order_email'], t('FORMAT_NAME_FULL_SIR', array('T_ARG1' => $arrOrder['order_name01'], 'T_ARG2' => $arrOrder['order_name02']))); 
     202        $objSendMail->setTo($arrOrder['order_email'], t('f_NAME_FULL_SIR_01', array('T_LASTNAME' => $arrOrder['order_name01'], 'T_FIRSTNAME' => $arrOrder['order_name02']))); 
    203203 
    204204        // 送信フラグ:trueの場合は、送信する。 
     
    334334        // 仮会員が有効の場合 
    335335        if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) { 
    336             $subject        = $objHelperMail->sfMakeSubject(t('SC_Helper_Mail_003'), $objMailText); 
     336            $subject        = $objHelperMail->sfMakeSubject(t('c_Confirmation of member registration_01'), $objMailText); 
    337337            $toCustomerMail = $objMailText->fetch('mail_templates/customer_mail.tpl'); 
    338338        } else { 
    339             $subject        = $objHelperMail->sfMakeSubject(t('SC_Helper_Mail_004'), $objMailText); 
     339            $subject        = $objHelperMail->sfMakeSubject(t('c_Completion of member registration_01'), $objMailText); 
    340340            $toCustomerMail = $objMailText->fetch('mail_templates/customer_regist_mail.tpl'); 
    341341        } 
     
    359359            $to_addr = $arrCustomerData['email']; 
    360360        } 
    361         $objMail->setTo($to_addr, t('FORMAT_NAME_FULL_SIR', array('T_ARG1' => $arrCustomerData['name01'], 'T_ARG2' => $arrCustomerData['name02']))); 
     361        $objMail->setTo($to_addr, t('f_NAME_FULL_SIR_01', array('T_LASTNAME' => $arrCustomerData['name01'], 'T_FIRSTNAME' => $arrCustomerData['name02']))); 
    362362 
    363363        $objMail->sendMail(); 
     
    500500 
    501501        // 送信完了 報告メール 
    502         $compSubject = date(t('FORMAT_DATE_LONG')) . ' '. t('SC_Helper_Mail_002'); 
     502        $compSubject = date(t('FORMAT_DATE_LONG')) . ' '. t('c_The e-mail below has been sent._01'); 
    503503        // 管理者宛に変更 
    504504        $objMail->setTo($objSite['email03']); 
Note: See TracChangeset for help on using the changeset viewer.