internationalization/localization, RT12515

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 859baa1..170281b 100755 (executable)
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -129,7 +129,7 @@
 </TABLE>
 
 <BR>
 </TABLE>
 
 <BR>

-<INPUT TYPE="submit" VALUE="Apply Changes">
+<INPUT TYPE="submit" VALUE="<% mt('Apply changes') |h %>">

 </FORM>
 
 <% include('/elements/footer.html') %>
 </FORM>
 
 <% include('/elements/footer.html') %>

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 1c188dc..17ce91d 100755 (executable)
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -58,7 +58,7 @@
 %  }
 
 <BR>
 %  }
 
 <BR>

-<FONT SIZE="+1"><B>Billing address</B></FONT>
+<FONT SIZE="+1"><B><% mt('Billing address') |h %></B></FONT>

 
 <& cust_main/contact.html,
              'cust_main'    => $cust_main,
 
 <& cust_main/contact.html,
              'cust_main'    => $cust_main,


@@ -209,7 +209,7 @@ function samechanged(what) {
 <INPUT TYPE    = "button"
        NAME    = "submitButton"
        ID      = "submitButton"
 <INPUT TYPE    = "button"
        NAME    = "submitButton"
        ID      = "submitButton"

-       VALUE   = "<% $custnum ?  "Apply Changes" : "Add Customer" %>"
+       VALUE   = "<% $custnum ?  emt("Apply changes") : emt("Add Customer") %>"

        onClick = "this.disabled=true; bottomfixup(this.form);"
 >
 </FORM>
        onClick = "this.disabled=true; bottomfixup(this.form);"
 >
 </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';
 $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!<font color="#ff0000">*</font>&nbsp;!;
 $title .= ": ". $cust_main->name if $custnum;
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 07266b9..39a0b70 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -190,7 +190,7 @@
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Exact name on card').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="CARD_payname" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
 %
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Exact name on card').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="CARD_payname" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
 %

-%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CARD_payauto" $CARD_payauto_checked> !.emt('Charge future payments to this card automatically').qq!</TD></TR>!.
+%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CARD_payauto" $CARD_payauto_checked> !.emt('Charge future payments to this [_1] automatically','credit card').qq!</TD></TR>!.

 %
 %      ( $conf->exists('cust_main-select-billday') ?
 %        qq!<TR><TD COLSPAN=2 WIDTH="608" id="card_billday" style="display: $billday_card_display">
 %
 %      ( $conf->exists('cust_main-select-billday') ?
 %        qq!<TR><TD COLSPAN=2 WIDTH="608" id="card_billday" style="display: $billday_card_display">


@@ -235,7 +235,7 @@
 %       ).
 %
 %
 %       ).
 %
 %

-%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CHEK_payauto" $CHEK_payauto_checked> !.emt('Charge future payments to this electronic check automatically').qq!</TD></TR>!.
+%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CHEK_payauto" $CHEK_payauto_checked> !.emt('Charge future payments to this [_1] automatically','electronic check').qq!</TD></TR>!.

 %
 %      ( $conf->exists('cust_main-select-billday') ?
 %        qq!<TR><TD COLSPAN=2 WIDTH="608" id="chek_billday" style="display: $billday_chek_display">
 %
 %      ( $conf->exists('cust_main-select-billday') ?
 %        qq!<TR><TD COLSPAN=2 WIDTH="608" id="chek_billday" style="display: $billday_chek_display">

diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html
index 229b84b..575b737 100644 (file)
--- 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') ) { 
 
   <TR>
 % } elsif ( ! $conf->exists('disable_customer_referrals') ) { 
 
   <TR>

-    <TD ALIGN="right">Referring customer</TD>
+    <TD ALIGN="right"><% mt('Referring customer') |h %></TD>

     <TD>
       <& /elements/search-cust_main.html,
                     'field_name' => 'referral_custnum',
     <TD>
       <& /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 ebbaf3c..4d9688f 100755 (executable)
--- a/httemplate/edit/cust_main_attach.cgi
+++ b/httemplate/edit/cust_main_attach.cgi
@@ -29,7 +29,7 @@
 <BR>
 % if(! $disabled) {
 <INPUT TYPE="submit" NAME="submit" 
 <BR>
 % if(! $disabled) {
 <INPUT TYPE="submit" NAME="submit" 

-    VALUE="<% $attachnum ? "Apply Changes" : "Upload File" %>">
+    VALUE="<% $attachnum ? emt("Apply changes") : emt("Upload File") %>">

 % }
 % if(defined $attach and $curuser->access_right('Delete attachment')) {
 <BR>
 % }
 % if(defined $attach and $curuser->access_right('Delete attachment')) {
 <BR>

diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi
index c4ec071..6159056 100755 (executable)
--- a/httemplate/edit/cust_main_note.cgi
+++ b/httemplate/edit/cust_main_note.cgi
@@ -29,7 +29,7 @@
 % }
 
 <BR><BR>
 % }
 
 <BR><BR>

-<INPUT TYPE="submit" VALUE="<% $notenum ? "Apply Changes" : "Add Note" %>">
+<INPUT TYPE="submit" VALUE="<% $notenum ? emt("Apply changes") : emt("Add Note") %>">

 
 </FORM>
 </BODY>
 
 </FORM>
 </BODY>

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 353a041..0bb86e3 100755 (executable)
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -43,7 +43,7 @@
 <TR>
   <TD ALIGN="right"><% mt('Amount') |h %></TD>
   <TD BGCOLOR="#ffffff" ALIGN="right"><% $money_char %></TD>
 <TR>
   <TD ALIGN="right"><% mt('Amount') |h %></TD>
   <TD BGCOLOR="#ffffff" ALIGN="right"><% $money_char %></TD>

-  <TD><INPUT TYPE="text" NAME="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=9> by <B><% FS::payby->payname($payby) %></B></TD>
+  <TD><INPUT TYPE="text" NAME="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=9> <% mt('by') |h %> <B><% mt(FS::payby->payname($payby)) |h %></B></TD>

 </TR>
 
   <& /elements/tr-select-discount_term.html,
 </TR>
 
   <& /elements/tr-select-discount_term.html,


@@ -142,8 +142,8 @@ die "access denied"
 
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
 
 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' ) {
 
 my $custnum;
 if ( $link eq 'invnum' ) {

diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 0ff1190..48c6159 100644 (file)
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -40,7 +40,7 @@ Example:
 % } 
 
 <TR>
 % } 
 
 <TR>

-  <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %></<%$th%>>
+  <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %></<%$th%>>

   <TD COLSPAN=7>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>address1"
   <TD COLSPAN=7>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>address1"


@@ -148,15 +148,15 @@ Example:
 
 
 <TR>
 
 
 <TR>

-  <<%$th%> ALIGN="right"><%$r%>City</<%$th%>>
+  <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %></<%$th%>>

   <TD WIDTH="1"><% include('/elements/city.html', %select_hash) %></TD>
   <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
   <TD WIDTH="1"><% include('/elements/select-county.html', %select_hash ) %></TD>
   <TD WIDTH="1"><% include('/elements/city.html', %select_hash) %></TD>
   <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
   <TD WIDTH="1"><% include('/elements/select-county.html', %select_hash ) %></TD>

-  <<%$th%> ALIGN="right" WIDTH="1"><%$r%>State</<%$th%>>
+  <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %></<%$th%>>

   <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
   </TD>
   <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
   </TD>

-  <<%$th%> ALIGN="right" WIDTH="1"><%$r%>Zip</<%$th%>>
+  <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('Zip') |h %></<%$th%>>

   <TD>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>zip"
   <TD>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>zip"


@@ -171,7 +171,7 @@ Example:
 </TR>
 
 <TR>
 </TR>
 
 <TR>

-  <<%$th%> ALIGN="right"><%$r%>Country</<%$th%>>
+  <<%$th%> ALIGN="right"><%$r%><% mt('Country') |h %></<%$th%>>

   <TD COLSPAN=6><% include('/elements/select-country.html', %select_hash ) %></TD>
 </TR>
 
   <TD COLSPAN=6><% include('/elements/select-country.html', %select_hash ) %></TD>
 </TR>
 

diff --git a/httemplate/elements/popup_link-cust_main.html b/httemplate/elements/popup_link-cust_main.html
index db53ad4..1413785 100644 (file)
--- a/httemplate/elements/popup_link-cust_main.html
+++ b/httemplate/elements/popup_link-cust_main.html
@@ -27,7 +27,7 @@ Example:
 % }
 <%init>
 
 % }
 <%init>
 

-my $params = { 'closetext' => 'Close' };
+my $params = { 'closetext' => emt('Close') };

 
 if (ref($_[0]) eq 'HASH') {
   $params = { %$params, %{ $_[0] } };
 
 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 cd8d5c0..39146c3 100644 (file)
--- a/httemplate/elements/popup_link-cust_pkg.html
+++ b/httemplate/elements/popup_link-cust_pkg.html
@@ -27,7 +27,7 @@ Example:
 % }
 <%init>
 
 % }
 <%init>
 

-my $params = { 'closetext' => 'Close',
+my $params = { 'closetext' => emt('Close'),

                'width'     => 768,
              };
 
                'width'     => 768,
              };
 

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 8b1895f..a876f62 100644 (file)
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -197,7 +197,7 @@ Example:
 </SCRIPT>
 
 <TR>
 </SCRIPT>
 
 <TR>

-  <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service&nbsp;location' %></<%$th%>>
+  <<%$th%> ALIGN="right"><% $opt{'label'} || emt('Service location') %></<%$th%>>

   <TD COLSPAN=7>
     <SELECT NAME     = "locationnum"
             ID       = "locationnum"
   <TD COLSPAN=7>
     <SELECT NAME     = "locationnum"
             ID       = "locationnum"

diff --git a/httemplate/elements/tr-select-discount.html b/httemplate/elements/tr-select-discount.html
index e8be393..6bfc485 100644 (file)
--- a/httemplate/elements/tr-select-discount.html
+++ b/httemplate/elements/tr-select-discount.html
@@ -6,7 +6,7 @@
 % } else { 
 
   <TR>
 % } else { 
 
   <TR>

-    <TD ALIGN="right" WIDTH="176"><% $opt{'label'} || '<B>Discount</B>' %></TD>
+    <TD ALIGN="right" WIDTH="176"><% $opt{'label'} || '<B>'.emt('Discount').'</B>' %></TD>

     <TD <% $colspan %>>
       <% include( '/elements/select-discount.html',
                     'curr_value' => $discountnum,
     <TD <% $colspan %>>
       <% include( '/elements/select-discount.html',
                     'curr_value' => $discountnum,

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index 01b283d..2ab9329 100755 (executable)
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -40,7 +40,7 @@
 <BR>
 <INPUT NAME    = "submitButton"
        TYPE    = "button"
 <BR>
 <INPUT NAME    = "submitButton"
        TYPE    = "button"

-       VALUE   = "Change package"
+       VALUE   = "<% mt("Change package") |h %>"

        onClick = "this.disabled=true; standardize_new_location();"
        <% scalar($cgi->param('pkgpart')) ? '' : 'DISABLED' %>
 >
        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 9854721..4c7a02b 100644 (file)
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -126,7 +126,7 @@
 %                 : 'standardize_new_location()';
 <INPUT NAME    = "submitButton"
        TYPE    = "button"
 %                 : 'standardize_new_location()';
 <INPUT NAME    = "submitButton"
        TYPE    = "button"

-       VALUE   = "Order Package"
+       VALUE   = "<% mt("Order Package") |h %>"

        onClick = "this.disabled=true; <% $onclick %>;"
        <% $pkgpart ? '' : 'DISABLED' %>
 >
        onClick = "this.disabled=true; <% $onclick %>;"
        <% $pkgpart ? '' : 'DISABLED' %>
 >

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 4c02da0..a033c1c 100644 (file)
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -222,7 +222,7 @@
 <TR>
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">
 <TR>
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">

-    <% mt('Remember this informatio') |h %>
+    <% mt('Remember this information') |h %>

   </TD>
 </TR>
 
   </TD>
 </TR>
 


@@ -265,8 +265,8 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Process payment');
 
 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)$/
            );
 
 $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 ba6b785..cf22c42 100644 (file)
--- 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();
   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();
   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') %>);

 
 }
 
 
 }