[freeside-commits] freeside/httemplate/view/cust_main/payment_history credit.html, 1.9, 1.10 invoice.html, 1.4, 1.5 payment.html, 1.11, 1.12 pending_payment.html, 1.4, 1.5 refund.html, 1.6, 1.7 voided_payment.html, 1.9, 1.10
Erik Levinson
levinse at wavetail.420.am
Tue May 17 18:06:31 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history
In directory wavetail.420.am:/tmp/cvs-serv5512/view/cust_main/payment_history
Modified Files:
credit.html invoice.html payment.html pending_payment.html
refund.html voided_payment.html
Log Message:
internationalization/localization, RT12515
Index: refund.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/refund.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- refund.html 17 May 2011 05:00:44 -0000 1.6
+++ refund.html 18 May 2011 01:06:28 -0000 1.7
@@ -13,26 +13,26 @@
: $cust_refund->payinfo;
$payby = translate_payby_refund($payby,$payinfo);
-my $refund = mt("Refund by [_1]",$cust_refund->otaker);
+my $refund = emt("Refund by [_1]",$cust_refund->otaker);
$refund = '<B><FONT COLOR="#FF0000">'
- . mt("Unapplied Refund by [_1]",$cust_refund->otaker)
+ . emt("Unapplied Refund by [_1]",$cust_refund->otaker)
. '</FONT></B>'
if $cust_refund->unapplied > 0;
my $view =
' ('. include('/elements/popup_link.html',
- 'label' => mt('view receipt'),
+ 'label' => emt('view receipt'),
'action' => "${p}view/cust_refund.html?link=popup;".
'refundnum='. $cust_refund->refundnum,
- 'actionlabel' => mt('Payment Receipt'),
+ 'actionlabel' => emt('Payment Receipt'),
).
')';
my $delete = '';
$delete = areyousure_link("${p}misc/delete-cust_refund.cgi?".$cust_refund->refundnum,
- mt('Are you sure you want to delete this refund?'),
- mt('Delete this refund from the database completely - not recommended'),
- mt('delete')
+ emt('Are you sure you want to delete this refund?'),
+ emt('Delete this refund from the database completely - not recommended'),
+ emt('delete')
)
if ( $cust_refund->closed !~ /^Y/i && $opt{'deleterefunds'}
&& $curuser->access_right('Delete refund') );
Index: invoice.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/invoice.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- invoice.html 16 May 2011 19:47:19 -0000 1.4
+++ invoice.html 18 May 2011 01:06:28 -0000 1.5
@@ -7,9 +7,9 @@
my $curuser = $FS::CurrentUser::CurrentUser;
-my $invoice = mt("Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed);
+my $invoice = emt("Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed);
$invoice = '<B><FONT SIZE="+1" COLOR="#FF0000">' .
- mt("Open Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed) .
+ emt("Open Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed) .
'</FONT></B>'
if ( $cust_bill->owed > 0 );
@@ -21,9 +21,9 @@
my $delete = '';
$delete = areyousure_link("${p}misc/delete-cust_bill.html?$invnum",
- mt('Are you sure you want to delete this invoice?'),
- mt('Delete this invoice from the database completely'),
- mt('delete')
+ emt('Are you sure you want to delete this invoice?'),
+ emt('Delete this invoice from the database completely'),
+ emt('delete')
)
if ( $opt{'deleteinvoices'} && $curuser->access_right('Delete invoices') );
@@ -36,7 +36,7 @@
) {
$events =
qq!<BR><FONT SIZE="-1"><A HREF="${p}search/cust_event.html?invnum=$invnum!.
- '">( '.mt('View invoice events').' )</A></FONT>';
+ '">( '.emt('View invoice events').' )</A></FONT>';
}
#
Index: credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/credit.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- credit.html 17 May 2011 05:00:43 -0000 1.9
+++ credit.html 18 May 2011 01:06:28 -0000 1.10
@@ -27,21 +27,21 @@
}
my( $apply, $ext ) = ( '', '', '', '' );
-my $credit = mt("Credit by [_1]", $cust_credit->otaker );
+my $credit = emt("Credit by [_1]", $cust_credit->otaker );
if ( scalar(@cust_credit_bill) == 0
&& scalar(@cust_credit_refund) == 0 ) {
#completely unapplied
$credit = '<B><FONT COLOR="#FF0000">'
- . mt("Unapplied Credit by [_1]", $cust_credit->otaker )
+ . emt("Unapplied Credit by [_1]", $cust_credit->otaker )
. '</FONT></B>';
if ( $curuser->access_right('Apply credit') ) {
if ( $cust_credit->cust_main->total_owed > 0 ) {
$apply = ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply'),
+ 'label' => emt('apply'),
'action' => "${p}edit/cust_credit_bill.cgi?".
$cust_credit->crednum,
- 'actionlabel' => mt('Apply credit'),
+ 'actionlabel' => emt('Apply credit'),
%cust_credit_bill_width,
%cust_credit_bill_height,
).
@@ -50,10 +50,10 @@
if ( $cust_credit->cust_main->total_unapplied_refunds > 0 ) {
$apply.= ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply to refund'),
+ 'label' => emt('apply to refund'),
'action' => "${p}edit/cust_credit_refund.cgi?".
$cust_credit->crednum,
- 'actionlabel' => mt('Apply credit to refund'),
+ 'actionlabel' => emt('Apply credit to refund'),
'width' => 392,
).
')';
@@ -68,7 +68,7 @@
&& scalar(@cust_credit_refund) == 1
&& $cust_credit->credited == 0 ) {
#applied to one refund
- $desc .= mt(" refunded on [_1]", time2str($date_format, $cust_credit_refund[0]->_date) );
+ $desc .= emt(" refunded on [_1]", time2str($date_format, $cust_credit_refund[0]->_date) );
} else {
#complicated
$desc .= '<BR>';
@@ -79,7 +79,7 @@
. $app->applied_to_invoice . '<BR>';
} elsif ( $app->isa('FS::cust_credit_refund') ) {
$desc .= ' ' .
- mt("[_1][_2] refunded on [_3]", $money_char, $app->amount,
+ emt("[_1][_2] refunded on [_3]", $money_char, $app->amount,
time2str($date_format, $app->_date) ) . '<BR>';
} else {
die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
@@ -87,16 +87,16 @@
}
if ( $cust_credit->credited > 0 ) {
$desc .= ' <B><FONT COLOR="#FF0000">' .
- mt("[_1][_2] unapplied", $money_char, $cust_credit->credited) .
+ emt("[_1][_2] unapplied", $money_char, $cust_credit->credited) .
'</FONT></B>';
if ( $curuser->access_right('Apply credit') ) {
if ( $cust_credit->cust_main->total_owed > 0 ) {
$apply = ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply'),
+ 'label' => emt('apply'),
'action' => "${p}edit/cust_credit_bill.cgi?".
$cust_credit->crednum,
- 'actionlabel' => mt('Apply credit'),
+ 'actionlabel' => emt('Apply credit'),
%cust_credit_bill_width,
%cust_credit_bill_height,
).
@@ -105,10 +105,10 @@
if ( $cust_credit->cust_main->total_unapplied_refunds > 0 ) {
$apply.= ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply to refund'),
+ 'label' => emt('apply to refund'),
'action' => "${p}edit/cust_credit_refund.cgi?".
$cust_credit->crednum,
- 'actionlabel' => mt('Apply credit to refund'),
+ 'actionlabel' => emt('Apply credit to refund'),
'width' => 392,
).
')';
@@ -120,17 +120,17 @@
#
my $delete = '';
$delete = areyousure_link("${p}misc/delete-cust_credit.cgi?".$cust_credit->crednum,
- mt('Are you sure you want to delete this credit?'),
+ emt('Are you sure you want to delete this credit?'),
'',
- mt('delete')
+ emt('delete')
)
if ( $cust_credit->closed !~ /^Y/i && $curuser->access_right('Delete credit') );
my $unapply = '';
$unapply = areyousure_link("${p}misc/unapply-cust_credit.cgi?".$cust_credit->crednum,
- mt('Are you sure you want to unapply this credit?'),
+ emt('Are you sure you want to unapply this credit?'),
'',
- mt('unapply')
+ emt('unapply')
)
if ( $cust_credit->closed !~ /^Y/i && scalar(@cust_credit_bill)
&& $curuser->access_right('Unapply credit') );
Index: pending_payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/pending_payment.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- pending_payment.html 17 May 2011 05:00:44 -0000 1.4
+++ pending_payment.html 18 May 2011 01:06:28 -0000 1.5
@@ -22,7 +22,7 @@
my $edit_pending =
$FS::CurrentUser::CurrentUser->access_right('Edit customer pending payments');
-my $status = mt("Status: [_1]",$cust_pay_pending->status);
+my $status = emt("Status: [_1]",$cust_pay_pending->status);
my $action = $statusaction{$cust_pay_pending->status};
@@ -32,11 +32,11 @@
'action' => $p. 'edit/cust_pay_pending.html'.
'?paypendingnum='. $cust_pay_pending->paypendingnum.
";action=$action",
- 'label' => mt($action),
+ 'label' => emt($action),
'color' => '#ff0000',
'width' => 655,
'height' => ( $action eq 'delete' ? 480 : 575 ),
- 'actionlabel' => mt(ucfirst($action). ' pending payment'),
+ 'actionlabel' => emt(ucfirst($action). ' pending payment'),
);
}
Index: voided_payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/voided_payment.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- voided_payment.html 17 May 2011 05:00:44 -0000 1.9
+++ voided_payment.html 18 May 2011 01:06:28 -0000 1.10
@@ -24,12 +24,12 @@
my $unvoid = '';
my $unvoidmsg = $cust_pay_void->payby =~ /^(CARD|CHEK)$/
- ? ' ('.mt('do not send anything to the payment gateway') .')'
+ ? ' ('.emt('do not send anything to the payment gateway') .')'
: '';
$unvoid = areyousure_link("${p}misc/unvoid-cust_pay_void.cgi?".$cust_pay_void->paynum,
- mt('Are you sure you want to unvoid this payment?'),
- mt('Unvoid this payment from the database') . $unvoidmsg,
- mt('unvoid')
+ emt('Are you sure you want to unvoid this payment?'),
+ emt('Unvoid this payment from the database') . $unvoidmsg,
+ emt('unvoid')
)
if ( $cust_pay_void->closed !~ /^Y/i && $curuser->access_right('Unvoid') );
Index: payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/payment.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- payment.html 17 May 2011 05:00:44 -0000 1.11
+++ payment.html 18 May 2011 01:06:28 -0000 1.12
@@ -37,22 +37,22 @@
$otaker = '<i>auto billing</i>' if $otaker eq 'fs_daily';
$otaker = '<i>customer self-service</i>' if $otaker eq 'fs_selfservice';
-my $payment = mt("Payment by [_1]",$otaker);
+my $payment = emt("Payment by [_1]",$otaker);
if ( scalar(@cust_bill_pay) == 0
&& scalar(@cust_pay_refund) == 0 ) {
#completely unapplied
$payment = '<B><FONT COLOR="#FF0000">'
- . mt("Unapplied Payment by [_1]",$otaker)
+ . emt("Unapplied Payment by [_1]",$otaker)
. '</FONT></B>';
if ( $curuser->access_right('Apply payment') ) {
if ( $cust_pay->cust_main->total_owed > 0 ) {
$apply = ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply'),
+ 'label' => emt('apply'),
'action' => "${p}edit/cust_bill_pay.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment'),
+ 'actionlabel' => emt('Apply payment'),
%cust_bill_pay_width,
%cust_bill_pay_height,
).
@@ -61,10 +61,10 @@
if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) {
$apply.= ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply to refund'),
+ 'label' => emt('apply to refund'),
'action' => "${p}edit/cust_pay_refund.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment to refund'),
+ 'actionlabel' => emt('Apply payment to refund'),
'width' => 392,
).
')';
@@ -79,7 +79,7 @@
&& scalar(@cust_pay_refund) == 1
&& $cust_pay->unapplied == 0 ) {
#applied to one refund
- $desc .= mt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) );
+ $desc .= emt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) );
} else {
#complicated
$desc .= '<BR>';
@@ -90,7 +90,7 @@
$app->applied_to_invoice . '<BR>';
} elsif ( $app->isa('FS::cust_pay_refund') ) {
$desc .= ' ' .
- mt("[_1][_2] refunded on [_3]", $money_char, $app->amount,
+ emt("[_1][_2] refunded on [_3]", $money_char, $app->amount,
time2str($date_format, $app->_date) ) . '<BR>';
} else {
die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
@@ -99,16 +99,16 @@
if ( $cust_pay->unapplied > 0 ) {
$desc .= ' '.
'<B><FONT COLOR="#FF0000">' .
- mt("[_1][_2] unapplied", $money_char, $cust_pay->unapplied) .
+ emt("[_1][_2] unapplied", $money_char, $cust_pay->unapplied) .
'</FONT></B>';
if ( $curuser->access_right('Apply payment') ) {
if ( $cust_pay->cust_main->total_owed > 0 ) {
$apply = ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply'),
+ 'label' => emt('apply'),
'action' => "${p}edit/cust_bill_pay.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment'),
+ 'actionlabel' => emt('Apply payment'),
%cust_bill_pay_width,
%cust_bill_pay_height,
).
@@ -117,10 +117,10 @@
if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) {
$apply.= ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply to refund'),
+ 'label' => emt('apply to refund'),
'action' => "${p}edit/cust_pay_refund.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment to refund'),
+ 'actionlabel' => emt('Apply payment to refund'),
'width' => 392,
).
')';
@@ -132,10 +132,10 @@
my $view =
' ('. include('/elements/popup_link.html',
- 'label' => mt('view receipt'),
+ 'label' => emt('view receipt'),
'action' => "${p}view/cust_pay.html?link=popup;paynum=".
$cust_pay->paynum,
- 'actionlabel' => mt('Payment Receipt'),
+ 'actionlabel' => emt('Payment Receipt'),
).
')';
@@ -152,18 +152,18 @@
) {
$refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
qq!paynum=!. $cust_pay->paynum. '"'.
- qq! TITLE="! .mt('Send a refund for this payment to the payment gateway')
- . '">' . mt('refund') . '</A>)';
+ qq! TITLE="! .emt('Send a refund for this payment to the payment gateway')
+ . '">' . emt('refund') . '</A>)';
}
my $void = '';
my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK)$/
- ? ' (' . mt('do not send anything to the payment gateway').')'
+ ? ' (' . emt('do not send anything to the payment gateway').')'
: '';
$void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum,
- mt('Are you sure you want to void this payment?'),
- mt('Void this payment from the database') . $voidmsg,
- mt('void')
+ emt('Are you sure you want to void this payment?'),
+ emt('Void this payment from the database') . $voidmsg,
+ emt('void')
)
if ( $cust_pay->closed !~ /^Y/i
&& ( ( $cust_pay->payby eq 'CARD'
@@ -180,18 +180,18 @@
my $delete = '';
$delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum,
- mt('Are you sure you want to delete this payment?'),
- mt('Delete this payment from the database completely - not recommended'),
- mt('delete')
+ emt('Are you sure you want to delete this payment?'),
+ emt('Delete this payment from the database completely - not recommended'),
+ emt('delete')
)
if ( $cust_pay->closed !~ /^Y/i && $opt{'deletepayments'}
&& $curuser->access_right('Delete payment') );
my $unapply = '';
$unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum,
- mt('Are you sure you want to unapply this payment?'),
- mt('Keep this payment, but dissociate it from the invoices it is currently applied against'),
- mt('unapply')
+ emt('Are you sure you want to unapply this payment?'),
+ emt('Keep this payment, but dissociate it from the invoices it is currently applied against'),
+ emt('unapply')
)
if ( $cust_pay->closed !~ /^Y/i && scalar(@cust_bill_pay)
&& $curuser->access_right('Unapply payment') );
More information about the freeside-commits
mailing list