internationalization/localization, RT12515

diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
index 30c16a7..1a8271c 100755 (executable)
--- 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 0681445..6e8a9c9 100755 (executable)
--- 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 1458987..3fe43dc 100644 (file)
--- 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 44c23f4..e6cd7d8 100755 (executable)
--- 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 f3794cc..0f9808d 100644 (file)
--- 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 6cba023..7d24fbe 100644 (file)
--- a/httemplate/elements/searchbar-cust_bill.html
+++ b/httemplate/elements/searchbar-cust_bill.html
@@ -6,7 +6,7 @@
     <A HREF="<%$fsurl%>search/report_cust_bill.html" CLASS="fslink" STYLE="font-size: 11px"><% mt('Adv') |h %></A>\
 %   } 
     <BR>
-    <INPUT TYPE="submit" VALUE="Search invoices" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
+    <INPUT TYPE="submit" VALUE="<% mt('Search invoices') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
   </FORM>
   <% $menu_position eq 'left' ? '<BR><BR>' : '' %>
 

diff --git a/httemplate/index.html b/httemplate/index.html
index 4507959..ae15096 100644 (file)
--- 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 0e2b115..3259a03 100644 (file)
--- 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 b6fe785..6e02e0e 100755 (executable)
--- 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) &>
 
 <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index cf3ed50..01b283d 100755 (executable)
--- 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") &>
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT>
 

diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 5801a52..002c001 100755 (executable)
--- 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") &>
   <SCRIPT TYPE="text/javascript">
     window.top.location.reload();
   </SCRIPT>

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 7d289c9..9854721 100644 (file)
--- 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') &>
 
 <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 36e8255..4c02da0 100644 (file)
--- 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" &>
 <FORM NAME="OneTrueForm" ACTION="process/payment.cgi" METHOD="POST" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="custnum"   VALUE="<% $custnum %>">

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 8b67215..b8af1fd 100755 (executable)
--- 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 ac63935..a2b90b4 100644 (file)
--- 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:
          )
 
 </%doc>
-<& /elements/header.html, emt($title) &>
+<& /elements/header.html, mt($title) &>
 
 <FORM ACTION="<% $table %>.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">

diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index 79f244f..4be5f73 100644 (file)
--- 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') &>
 
 <FORM ACTION="cust_bill.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">

diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 50a5bfc..dbab66a 100644 (file)
--- 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) &>
 
 <FORM ACTION="cust_credit.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">

diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index d4ed2ad..0ef5a51 100755 (executable)
--- 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') &>
 
 <FORM ACTION="cust_main.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="bill">

diff --git a/httemplate/search/report_receivables.html b/httemplate/search/report_receivables.html
index e19877d..19f8635 100755 (executable)
--- 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') &>
 
 <FORM NAME="OneTrueForm" ACTION="report_receivables.cgi" METHOD="GET">
 

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4dc03ad..2ce294e 100755 (executable)
--- 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 fb3bfc3..a6c917f 100755 (executable)
--- 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') ) { 
-  <A HREF="<% $p %>edit/cust_main.cgi?<% $custnum %>">Edit this customer</A> | 
+  <A HREF="<% $p %>edit/cust_main.cgi?<% $custnum %>"><% mt('Edit this customer') |h %></A> | 
 % } 
 
 % 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 26bd581..40ab3af 100644 (file)
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -220,7 +220,7 @@
   <TD BGCOLOR="#ffffff">
     <% length($cust_main->credit_limit) ? 
         $money_char.sprintf("%.2f", $cust_main->credit_limit) :
-        'Unlimited' %>
+        emt('Unlimited') %>
   </TD>
 </TR>
 

diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html
index 9871ff9..c9b2d51 100644 (file)
--- 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") &>
 
   <div align="center">
     <A HREF="javascript:self.parent.location = '<% $pr_link %>'"><% mt('Print') |h %></A> | 
@@ -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 @@
   <BR><BR>
 % } 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 898402e..f19c61b 100644 (file)
--- 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') &>
 
   <CENTER><A HREF="javascript:self.parent.location = '<% $pr_link %>'"><% mt('Print') |h %></A></CENTER><BR>
 
 % } 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 8f915a1..38fa90e 100644 (file)
--- 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 f8a4c1f..6f79a01 100755 (executable)
--- 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" &> 
   <BR>
@@ -15,7 +15,7 @@
   }
   </SCRIPT>
   
-  <& /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\')",
   ) &>