From: levinse Date: Fri, 27 May 2011 05:57:19 +0000 (+0000) Subject: internationalization/localization, RT12515 X-Git-Tag: freeside_2_3_0~200 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d0c5ddbd31af8b1747d447f31623e1af05961eb4 internationalization/localization, RT12515 --- diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi index 859baa1b1..170281ba0 100755 --- a/httemplate/edit/REAL_cust_pkg.cgi +++ b/httemplate/edit/REAL_cust_pkg.cgi @@ -129,7 +129,7 @@
- + <% include('/elements/footer.html') %> diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index 1c188dc14..17ce91dd2 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -58,7 +58,7 @@ % }
-Billing address +<% mt('Billing address') |h %> <& cust_main/contact.html, 'cust_main' => $cust_main, @@ -209,7 +209,7 @@ function samechanged(what) { " + VALUE = "<% $custnum ? emt("Apply changes") : emt("Add Customer") %>" onClick = "this.disabled=true; bottomfixup(this.form);" > @@ -366,7 +366,7 @@ my %keep = map { $_=>1 } qw( error tagnum lock_agentnum lock_pkgpart ); $cgi->delete( grep !$keep{$_}, $cgi->param ); my $title = $custnum ? 'Edit Customer' : 'Add Customer'; -$title = emt($title); +$title = mt($title); $title .= ": ". $cust_main->name if $custnum; my $r = qq!* !; diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index 07266b9a6..39a0b70ed 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -190,7 +190,7 @@ % qq!${r}!.emt('Exact name on card').qq! !. % qq!!. % -% qq! !.emt('Charge future payments to this card automatically').qq!!. +% qq! !.emt('Charge future payments to this [_1] automatically','credit card').qq!!. % % ( $conf->exists('cust_main-select-billday') ? % qq! @@ -235,7 +235,7 @@ % ). % % -% qq! !.emt('Charge future payments to this electronic check automatically').qq!!. +% qq! !.emt('Charge future payments to this [_1] automatically','electronic check').qq!!. % % ( $conf->exists('cust_main-select-billday') ? % qq! diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html index 229b84ba4..575b73727 100644 --- a/httemplate/edit/cust_main/top_misc.html +++ b/httemplate/edit/cust_main/top_misc.html @@ -84,7 +84,7 @@ % } elsif ( ! $conf->exists('disable_customer_referrals') ) { - Referring customer + <% mt('Referring customer') |h %> <& /elements/search-cust_main.html, 'field_name' => 'referral_custnum', diff --git a/httemplate/edit/cust_main_attach.cgi b/httemplate/edit/cust_main_attach.cgi index ebbaf3cf3..4d9688fe9 100755 --- a/httemplate/edit/cust_main_attach.cgi +++ b/httemplate/edit/cust_main_attach.cgi @@ -29,7 +29,7 @@
% if(! $disabled) { "> + VALUE="<% $attachnum ? emt("Apply changes") : emt("Upload File") %>"> % } % if(defined $attach and $curuser->access_right('Delete attachment')) {
diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi index c4ec071b8..61590566c 100755 --- a/httemplate/edit/cust_main_note.cgi +++ b/httemplate/edit/cust_main_note.cgi @@ -29,7 +29,7 @@ % }

-"> +"> diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi index 353a04106..0bb86e352 100755 --- a/httemplate/edit/cust_pay.cgi +++ b/httemplate/edit/cust_pay.cgi @@ -43,7 +43,7 @@ <% mt('Amount') |h %> <% $money_char %> - by <% FS::payby->payname($payby) %> + <% mt('by') |h %> <% mt(FS::payby->payname($payby)) |h %> <& /elements/tr-select-discount_term.html, @@ -142,8 +142,8 @@ die "access denied" my $paybatch = "webui-$_date-$$-". rand() * 2**32; -my $title = emt('Post '. FS::payby->payname($payby). ' payment'); -$title .= emt(" against Invoice #[_1]",$linknum) if $link eq 'invnum'; +my $title = mt('Post '. FS::payby->payname($payby). ' payment'); +$title .= mt(" against Invoice #[_1]",$linknum) if $link eq 'invnum'; my $custnum; if ( $link eq 'invnum' ) { diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index 0ff119009..48c6159bb 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -40,7 +40,7 @@ Example: % } - <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %>> + <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %>> - <<%$th%> ALIGN="right"><%$r%>City> + <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %>> <% include('/elements/city.html', %select_hash) %> <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County> <% include('/elements/select-county.html', %select_hash ) %> - <<%$th%> ALIGN="right" WIDTH="1"><%$r%>State> + <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %>> <% include('/elements/select-state.html', %select_hash ) %> - <<%$th%> ALIGN="right" WIDTH="1"><%$r%>Zip> + <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('Zip') |h %>> - <<%$th%> ALIGN="right"><%$r%>Country> + <<%$th%> ALIGN="right"><%$r%><% mt('Country') |h %>> <% include('/elements/select-country.html', %select_hash ) %> diff --git a/httemplate/elements/popup_link-cust_main.html b/httemplate/elements/popup_link-cust_main.html index db53ad480..14137859f 100644 --- a/httemplate/elements/popup_link-cust_main.html +++ b/httemplate/elements/popup_link-cust_main.html @@ -27,7 +27,7 @@ Example: % } <%init> -my $params = { 'closetext' => 'Close' }; +my $params = { 'closetext' => emt('Close') }; if (ref($_[0]) eq 'HASH') { $params = { %$params, %{ $_[0] } }; diff --git a/httemplate/elements/popup_link-cust_pkg.html b/httemplate/elements/popup_link-cust_pkg.html index cd8d5c069..39146c35a 100644 --- a/httemplate/elements/popup_link-cust_pkg.html +++ b/httemplate/elements/popup_link-cust_pkg.html @@ -27,7 +27,7 @@ Example: % } <%init> -my $params = { 'closetext' => 'Close', +my $params = { 'closetext' => emt('Close'), 'width' => 768, }; diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html index 8b1895fae..a876f6225 100644 --- a/httemplate/elements/tr-select-cust_location.html +++ b/httemplate/elements/tr-select-cust_location.html @@ -197,7 +197,7 @@ Example: - <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service location' %>> + <<%$th%> ALIGN="right"><% $opt{'label'} || emt('Service location') %>> " onClick = "this.disabled=true; standardize_new_location();" <% scalar($cgi->param('pkgpart')) ? '' : 'DISABLED' %> > diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 985472142..4c7a02b1e 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -126,7 +126,7 @@ % : 'standardize_new_location()'; " onClick = "this.disabled=true; <% $onclick %>;" <% $pkgpart ? '' : 'DISABLED' %> > diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 4c02da066..a033c1cea 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -222,7 +222,7 @@ - <% mt('Remember this informatio') |h %> + <% mt('Remember this information') |h %> @@ -265,8 +265,8 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Process payment'); -my %type = ( 'CARD' => emt('credit card'), - 'CHEK' => emt('electronic check (ACH)'), +my %type = ( 'CARD' => 'credit card', + 'CHEK' => 'electronic check (ACH)', ); $cgi->param('payby') =~ /^(CARD|CHEK)$/ diff --git a/httemplate/view/cust_main/one_time_charge_link.html b/httemplate/view/cust_main/one_time_charge_link.html index ba6b7853c..cf22c420e 100644 --- a/httemplate/view/cust_main/one_time_charge_link.html +++ b/httemplate/view/cust_main/one_time_charge_link.html @@ -40,7 +40,7 @@ function taxproductquickchargemagic() { str += 'magic=taxproductnum;taxproductnum='; str += escape(document.getElementById('taxproductnum').value); cClick(); - overlib( OLiframeContent('<% $p %>/edit/quick-charge.html?'+str, 545, 336, 'One-time charge'), CAPTION, 'One-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, 'Close'); + overlib( OLiframeContent('<% $p %>/edit/quick-charge.html?'+str, 545, 336, 'One-time charge'), CAPTION, 'One-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, <% mt('Close') %>); } @@ -66,7 +66,7 @@ function taxoverridequickchargemagic() { str += 'magic=taxoverride;tax_override='; str += document.getElementById('tax_override').value; cClick(); - overlib( OLiframeContent('<% $p %>/edit/quick-charge.html?'+str, 545, 336, 'One-time charge'), CAPTION, 'One-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, 'Close'); + overlib( OLiframeContent('<% $p %>/edit/quick-charge.html?'+str, 545, 336, 'One-time charge'), CAPTION, 'One-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, <% mt('Close') %>); }