From 8ef00c68688492b2afa3dde8d3d467f89f238c40 Mon Sep 17 00:00:00 2001 From: levinse Date: Fri, 27 May 2011 02:25:43 +0000 Subject: [PATCH] internationalization/localization, RT12515 --- httemplate/browse/msgcat.cgi | 2 +- httemplate/edit/cust_credit.cgi | 2 +- httemplate/edit/quick-charge.html | 2 +- httemplate/edit/svc_acct.cgi | 2 +- httemplate/elements/errorpage.html | 2 +- httemplate/elements/searchbar-cust_bill.html | 2 +- httemplate/index.html | 2 +- httemplate/misc/cancel_cust.html | 2 +- httemplate/misc/cancel_pkg.html | 2 +- httemplate/misc/change_pkg.cgi | 2 +- httemplate/misc/cust_main-cancel.cgi | 2 +- httemplate/misc/order_pkg.html | 2 +- httemplate/misc/payment.cgi | 2 +- httemplate/search/cust_main.cgi | 2 +- httemplate/search/elements/report_cust_pay_or_refund.html | 2 +- httemplate/search/report_cust_bill.html | 2 +- httemplate/search/report_cust_credit.html | 2 +- httemplate/search/report_cust_main.html | 2 +- httemplate/search/report_receivables.html | 2 +- httemplate/view/cust_bill.cgi | 2 +- httemplate/view/cust_main.cgi | 4 ++-- httemplate/view/cust_main/billing.html | 2 +- httemplate/view/cust_pay.html | 10 +++++----- httemplate/view/cust_refund.html | 6 +++--- httemplate/view/elements/svc_Common.html | 4 ++-- httemplate/view/svc_acct.cgi | 4 ++-- 26 files changed, 35 insertions(+), 35 deletions(-) diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi index 30c16a701..1a8271c17 100755 --- a/httemplate/browse/msgcat.cgi +++ b/httemplate/browse/msgcat.cgi @@ -1,4 +1,4 @@ -<& /elements/header.html, emt("View Message catalog"), menubar( +<& /elements/header.html, mt("View Message catalog"), menubar( emt('Edit message catalog') => $p. "edit/msgcat.cgi", ) &> <% $widget->html %> diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi index 068144547..6e8a9c989 100755 --- a/httemplate/edit/cust_credit.cgi +++ b/httemplate/edit/cust_credit.cgi @@ -1,4 +1,4 @@ -<& /elements/header-popup.html, emt('Enter Credit') &> +<& /elements/header-popup.html, mt('Enter Credit') &> <& /elements/error.html &> diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 145898746..3fe43dcbc 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -1,4 +1,4 @@ -<& /elements/header-popup.html, emt('One-time charge'), '', +<& /elements/header-popup.html, mt('One-time charge'), '', ( $cgi->param('error') ? '' : 'onload="addRow()"' ), &> diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 44c23f4d2..e6cd7d86c 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -1,4 +1,4 @@ -<& /elements/header.html, emt("$action [_1] account",$svc) &> +<& /elements/header.html, mt("$action [_1] account",$svc) &> <& /elements/error.html &> diff --git a/httemplate/elements/errorpage.html b/httemplate/elements/errorpage.html index f3794cc13..0f9808da0 100644 --- a/httemplate/elements/errorpage.html +++ b/httemplate/elements/errorpage.html @@ -1,4 +1,4 @@ -<& /elements/header.html, emt("Error") &> +<& /elements/header.html, mt("Error") &> % while (@_) { diff --git a/httemplate/elements/searchbar-cust_bill.html b/httemplate/elements/searchbar-cust_bill.html index 6cba02370..7d24fbe9d 100644 --- a/httemplate/elements/searchbar-cust_bill.html +++ b/httemplate/elements/searchbar-cust_bill.html @@ -6,7 +6,7 @@ <% mt('Adv') |h %>\ % }
- + <% $menu_position eq 'left' ? '

' : '' %> diff --git a/httemplate/index.html b/httemplate/index.html index 450795972..ae1509610 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -1,4 +1,4 @@ -<& /elements/header.html, emt('Billing Main') &> +<& /elements/header.html, mt('Billing Main') &> <& /elements/dashboard-install_welcome.html &> diff --git a/httemplate/misc/cancel_cust.html b/httemplate/misc/cancel_cust.html index 0e2b11541..3259a03f6 100644 --- a/httemplate/misc/cancel_cust.html +++ b/httemplate/misc/cancel_cust.html @@ -1,4 +1,4 @@ -<& /elements/header-popup.html, emt('Cancel customer') &> +<& /elements/header-popup.html, mt('Cancel customer') &> <& /elements/error.html &> diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html index b6fe78522..6e02e0e39 100755 --- a/httemplate/misc/cancel_pkg.html +++ b/httemplate/misc/cancel_pkg.html @@ -1,4 +1,4 @@ -<& /elements/header-popup.html, emt($title) &> +<& /elements/header-popup.html, mt($title) &> diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi index cf3ed50cd..01b283d7a 100755 --- a/httemplate/misc/change_pkg.cgi +++ b/httemplate/misc/change_pkg.cgi @@ -1,4 +1,4 @@ -<& /elements/header-popup.html, emt("Change Package") &> +<& /elements/header-popup.html, mt("Change Package") &> diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi index 5801a5277..002c0011a 100755 --- a/httemplate/misc/cust_main-cancel.cgi +++ b/httemplate/misc/cust_main-cancel.cgi @@ -1,4 +1,4 @@ -<& /elements/header.html, emt("Customer cancelled") &> +<& /elements/header.html, mt("Customer cancelled") &> diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 7d289c945..985472142 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -1,4 +1,4 @@ -<& /elements/header-popup.html, emt('Order new package') &> +<& /elements/header-popup.html, mt('Order new package') &> diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 36e8255f1..4c02da066 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -1,4 +1,4 @@ -<& /elements/header.html, emt("Process [_1] payment",$type{$payby}) &> +<& /elements/header.html, mt("Process [_1] payment",$type{$payby}) &> <& /elements/small_custview.html, $cust_main, '', '', popurl(2) . "view/cust_main.cgi" &>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 8b67215bc..b8af1fdc4 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -8,7 +8,7 @@ % errorpage(emt("No matching customers found!")); % } # errorpage quits, so we don't need an 'else' below -<& /elements/header.html, emt("Customer Search Results"), '' &> +<& /elements/header.html, mt("Customer Search Results"), '' &> % $total ||= scalar(@cust_main); <% mt("[_1] matching customers found",$total) |h %> diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html index ac63935a5..a2b90b47d 100644 --- a/httemplate/search/elements/report_cust_pay_or_refund.html +++ b/httemplate/search/elements/report_cust_pay_or_refund.html @@ -13,7 +13,7 @@ Examples: ) -<& /elements/header.html, emt($title) &> +<& /elements/header.html, mt($title) &> diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html index 79f244f61..4be5f73a7 100644 --- a/httemplate/search/report_cust_bill.html +++ b/httemplate/search/report_cust_bill.html @@ -1,4 +1,4 @@ -<& /elements/header.html, emt('Invoice Report') &> +<& /elements/header.html, mt('Invoice Report') &> diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html index 50a5bfcf8..dbab66ae5 100644 --- a/httemplate/search/report_cust_credit.html +++ b/httemplate/search/report_cust_credit.html @@ -1,4 +1,4 @@ -<& /elements/header.html, emt($title) &> +<& /elements/header.html, mt($title) &> diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html index d4ed2ad87..0ef5a5196 100755 --- a/httemplate/search/report_cust_main.html +++ b/httemplate/search/report_cust_main.html @@ -1,4 +1,4 @@ -<& /elements/header.html, emt('Customer Report') &> +<& /elements/header.html, mt('Customer Report') &> diff --git a/httemplate/search/report_receivables.html b/httemplate/search/report_receivables.html index e19877d06..19f863525 100755 --- a/httemplate/search/report_receivables.html +++ b/httemplate/search/report_receivables.html @@ -1,4 +1,4 @@ -<& /elements/header.html, emt('Accounts Receivable Aging Summary') &> +<& /elements/header.html, mt('Accounts Receivable Aging Summary') &> diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 4dc03adc3..2ce294e9a 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -1,4 +1,4 @@ -<& /elements/header.html, emt('Invoice View'), menubar( +<& /elements/header.html, mt('Invoice View'), menubar( emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum", ) &> diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index fb3bfc314..a6c917f20 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -43,7 +43,7 @@ function areyousure(href, message) { % if ( $view eq 'basics' || $view eq 'jumbo' ) { % if ( $curuser->access_right('Edit customer') ) { - Edit this customer | + <% mt('Edit this customer') |h %> | % } % if ( $curuser->access_right('Cancel customer') @@ -295,7 +295,7 @@ die "Customer not found!" unless $cust_main; my $title = $cust_main->name; $title = '('. $cust_main->display_custnum. ") $title" if $conf->exists('cust_main-title-display_custnum'); -$title = "Customer: $title"; +$title = mt("Customer:")." ".$title; #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view) tie my %views, 'Tie::IxHash', diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 26bd5814e..40ab3afbf 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -220,7 +220,7 @@ <% length($cust_main->credit_limit) ? $money_char.sprintf("%.2f", $cust_main->credit_limit) : - 'Unlimited' %> + emt('Unlimited') %> diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html index 9871ff91c..c9b2d51b5 100644 --- a/httemplate/view/cust_pay.html +++ b/httemplate/view/cust_pay.html @@ -1,6 +1,6 @@ % if ( $link eq 'popup' ) { - <& /elements/header-popup.html, emt("$thing Receipt") &> + <& /elements/header-popup.html, mt("$thing Receipt") &>
<% mt('Print') |h %> | @@ -9,7 +9,7 @@ % } elsif ( $link eq 'print' ) { - <& /elements/header-popup.html, emt("$thing Receipt") &> + <& /elements/header-popup.html, mt("$thing Receipt") &> % #it would be nice if the menubar could be hidden for print, but better to % # have it available than not, otherwise the user winds up at a dead end @@ -20,13 +20,13 @@

% } elsif ( $link eq 'email' ) { % if ( $email_error ) { - <& /elements/header-popup.html, emt("Error re-emailing receipt: [_1]", $email_error) &> + <& /elements/header-popup.html, mt("Error re-emailing receipt: [_1]", $email_error) &> % } else { - <& /elements/header-popup.html, emt("Re-emailed receipt") &> + <& /elements/header-popup.html, mt("Re-emailed receipt") &> % } % } else { - <& /elements/header.html, emt("$thing Receipt"), menubar( + <& /elements/header.html, mt("$thing Receipt"), menubar( emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum", emt('Print receipt') => $pr_link, ) diff --git a/httemplate/view/cust_refund.html b/httemplate/view/cust_refund.html index 898402e06..f19c61b1f 100644 --- a/httemplate/view/cust_refund.html +++ b/httemplate/view/cust_refund.html @@ -1,12 +1,12 @@ % if ( $link eq 'popup' ) { - <& /elements/header-popup.html, emt('Refund Receipt') &> + <& /elements/header-popup.html, mt('Refund Receipt') &>
<% mt('Print') |h %>

% } elsif ( $link eq 'print' ) { - <& /elements/header-popup.html, emt('Refund Receipt') &> + <& /elements/header-popup.html, mt('Refund Receipt') &> % #it would be nice if the menubar could be hidden for print, but better to % # have it available than not, otherwise the user winds up at a dead end @@ -18,7 +18,7 @@ % } else { - <& /elements/header.html, emt('Refund Receipt'), menubar( + <& /elements/header.html, mt('Refund Receipt'), menubar( emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum", emt('Print receipt') => $pr_link, ) diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html index 8f915a10e..38fa90eb9 100644 --- a/httemplate/view/elements/svc_Common.html +++ b/httemplate/view/elements/svc_Common.html @@ -35,7 +35,7 @@ function areyousure(href) { % if ( $custnum ) { - <& /elements/header.html,emt("View [_1]: [_2]",$label,$value) &> + <& /elements/header.html, mt("View [_1]: [_2]",$label,$value) &> <& /elements/small_custview.html, $custnum, '', 1, "${p}view/cust_main.cgi" &> @@ -43,7 +43,7 @@ function areyousure(href) { % } else { - <& /elements/header.html,emt("View [_1]: [_2]",$label,$value), menubar( + <& /elements/header.html, mt("View [_1]: [_2]",$label,$value), menubar( emt("Cancel this (unaudited) [_1]",$label) => "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" ) &> diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index f8a4c1f61..6f79a01a4 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -1,6 +1,6 @@ % if ( $custnum ) { - <& /elements/header.html, emt("View [_1] account",$svc) &> + <& /elements/header.html, mt("View [_1] account",$svc) &> <& /elements/small_custview.html, $custnum, '', 1, "${p}view/cust_main.cgi" &>
@@ -15,7 +15,7 @@ } - <& /elements/header.html, emt('View account'), menubar( + <& /elements/header.html, mt('View account'), menubar( emt("Cancel this (unaudited) account") => "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')", ) &> -- 2.11.0