fix translation escaping

diff --git a/httemplate/elements/change_password.html b/httemplate/elements/change_password.html
index 2b40ec1..a84e823 100644 (file)
--- a/httemplate/elements/change_password.html
+++ b/httemplate/elements/change_password.html
@@ -8,7 +8,7 @@
   display: none;
 }
 </STYLE>
-<A ID="<%$pre%>link" HREF="javascript:void(0)" onclick="<%$pre%>toggle(true)">(<% mt('change') %>)</A>
+<A ID="<%$pre%>link" HREF="javascript:void(0)" onclick="<%$pre%>toggle(true)">(<% emt('change') %>)</A>
 <DIV ID="<%$pre%>form" CLASS="passwordbox">
   <FORM METHOD="POST" ACTION="<%$fsurl%>misc/process/change-password.html">
     <INPUT TYPE="hidden" NAME="svcnum" VALUE="<% $svc_acct->svcnum |h%>">

diff --git a/httemplate/elements/tr-cust_main-phones.html b/httemplate/elements/tr-cust_main-phones.html
index accf8ac..a193401 100644 (file)
--- a/httemplate/elements/tr-cust_main-phones.html
+++ b/httemplate/elements/tr-cust_main-phones.html
@@ -1,22 +1,22 @@
   <TR>
-    <TD ALIGN="right" VALIGN="top"><% mt('Phones') %></TD>
+    <TD ALIGN="right" VALIGN="top"><% emt('Phones') %></TD>
     <TD COLSPAN=6>
 
       <TABLE CELLSPACING=0 CELLPADDING=0>
         <TR>
           <TD>
             <INPUT TYPE="text" NAME="<%$pre%>daytime" VALUE="<% $cust_main->get($pre.'daytime') %>" SIZE=18 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
-            <BR><FONT SIZE=-1><% $daytime_label %></FONT>
+            <BR><FONT SIZE=-1><% $daytime_label |h %></FONT>
           </TD>
           <TD>&nbsp;</TD>
           <TD>
             <INPUT TYPE="text" NAME="<%$pre%>night" VALUE="<% $cust_main->get($pre.'night') %>" SIZE=18 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
-            <BR><FONT SIZE=-1><% $night_label %></FONT>
+            <BR><FONT SIZE=-1><% $night_label |h %></FONT>
           </TD>
           <TD>&nbsp;</TD>
           <TD>
             <INPUT TYPE="text" NAME="<%$pre%>mobile" VALUE="<% $cust_main->get($pre.'mobile') %>" SIZE=18 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
-            <BR><FONT SIZE=-1><% $mobile_label %></FONT>
+            <BR><FONT SIZE=-1><% $mobile_label |h %></FONT>
           </TD>
         </TR>
       </TABLE>

diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index 197ade1..d4d4afa 100644 (file)
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -288,7 +288,7 @@ function create_application_row(rownum, appnum) {
   td_invnum.setAttribute('colspan', 4);
   td_invnum.style.textAlign = 'right';
   td_invnum.appendChild(
-    document.createTextNode('<% mt('Apply to Invoice ') %>')
+    document.createTextNode(<% mt('Apply to Invoice ') |js_string %>)
   );
   var select_invnum = document.createElement('SELECT');
   select_invnum.setAttribute('rownum', rownum);

diff --git a/httemplate/misc/change_pkg_contact.html b/httemplate/misc/change_pkg_contact.html
index c88140e..26eacb9 100755 (executable)
--- a/httemplate/misc/change_pkg_contact.html
+++ b/httemplate/misc/change_pkg_contact.html
@@ -16,7 +16,7 @@
 
 % if ( $cust_pkg->contactnum ) {
     <TR>
-      <TH ALIGN="right"><% mt('Current Contact') %></TH>
+      <TH ALIGN="right"><% emt('Current Contact') %></TH>
       <TD COLSPAN=7 BGCOLOR="#dddddd">
         <% $cust_pkg->contact_obj->line |h %>
       </TD>

diff --git a/httemplate/misc/detach_pkg.html b/httemplate/misc/detach_pkg.html
index 366bbac..2562da9 100755 (executable)
--- a/httemplate/misc/detach_pkg.html
+++ b/httemplate/misc/detach_pkg.html
@@ -30,7 +30,7 @@
     <INPUT TYPE="hidden" NAME="last"  VALUE="<% $cust_contact->get('last')  |h %>">
 
     <TR>
-      <TH ALIGN="right"><% mt('Name') %></TH>
+      <TH ALIGN="right"><% emt('Name') %></TH>
       <TD COLSPAN=7 BGCOLOR="#dddddd">
         <% $cust_pkg->contact_obj->line |h %>
       </TD>
@@ -38,7 +38,7 @@
 % #}
 
   <TR>
-    <TH ALIGN="right" VALIGN="top"><% mt('Address') %></TH>
+    <TH ALIGN="right" VALIGN="top"><% emt('Address') %></TH>
     <TD COLSPAN=7 BGCOLOR="#dddddd">
 
       <% $loc->location_label( 'join_string'     => '<BR>',

diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index dfb2ea2..127c1b8 100644 (file)
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -32,9 +32,9 @@
   <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
   
   <& /elements/tr-select-cust_main-status.html,
-      label => mt('Customer Status') &>
+      label => emt('Customer Status') &>
   <& /elements/tr-select-cust_class.html,
-      label => mt('Customer Class'), field => 'cust_classnum', multiple => 1 &>
+      label => emt('Customer Class'), field => 'cust_classnum', multiple => 1 &>
   <& /elements/tr-select.html,
       label => 'Invoice Status',
       field => 'mode',
@@ -43,7 +43,7 @@
     <TD ALIGN="right">
       <INPUT TYPE="checkbox" NAME="include_monthly" VALUE=1>
     </TD>
-    <TD ALIGN="left"><% mt('Include packages with period &le; 1 month') %>
+    <TD ALIGN="left"><% emt('Include packages with period < 1 month') %>
     </TD>
   </TR>
   <TR>

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index c25dc3e..2d09082 100755 (executable)
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -84,7 +84,7 @@ function areyousure(href, message) {
 %   $onclick = '<A HREF="#" onclick="'.$onclick.'">';
 %   if ( $cust_bill->promised_date ) {
 %     my $date_format = $conf->config('date_format') || '%b %o, %Y';
-      <% mt('Payment promised by [_1]', 
+      <% emt('Payment promised by [_1]', 
             time2str($date_format, $cust_bill->promised_date) ) %>
       (&nbsp;<% $onclick %><% mt('change') |h %></A>&nbsp;)
       <BR><BR>
@@ -149,7 +149,7 @@ function areyousure(href, message) {
 %   $cust_bill->cust_main->agent->invoice_modes;
 % if ( @modes || $include_statement_template ) {
 <% $br ? '|' : '' %>
-<% mt('View as:') %>
+<% emt('View as:') %>
 <FORM STYLE="display:inline" ACTION="<% $cgi->url %>" METHOD="GET">
 <INPUT NAME="invnum" VALUE="<% $invnum %>" TYPE="hidden">
 <& /elements/select-table.html,

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 053f039..252ca10 100644 (file)
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -10,7 +10,7 @@
 %   if ( $this eq 'ship' and 
 %       $cust_main->bill_locationnum == $cust_main->ship_locationnum )
 %   {
- (<% mt('same as billing') %>)
+ (<% emt('same as billing') %>)
 %   }
 </FONT>
 %   if (

diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index b085b55..c7399ae 100644 (file)
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -183,7 +183,7 @@
 % if ( $conf->exists('ticket_system-selfservice_edit_subject') ) {
 
   <TR>
-    <TD ALIGN="right"><% mt('Edit ticket subjects') %></TD>
+    <TD ALIGN="right"><% emt('Edit ticket subjects') %></TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->edit_subject ? 'yes' : 'no' %></TD>
   </TR>
 

diff --git a/httemplate/view/cust_main/notes/email.html b/httemplate/view/cust_main/notes/email.html
index da2c352..41c5b8a 100644 (file)
--- a/httemplate/view/cust_main/notes/email.html
+++ b/httemplate/view/cust_main/notes/email.html
@@ -8,22 +8,22 @@
 .row1 {background-color: #ffffff}
 </STYLE>
 <DIV id="cust_msg">
-<FONT SIZE="+1"> <% mt('Email sent to this customer') %> </FONT><BR>
+<FONT SIZE="+1"> <% emt('Email sent to this customer') %> </FONT><BR>
 %   if ($maxrecords < $total) {
-<% mt('Showing [_1] most recent of [quant,_2,total message]', $maxrecords, $total) %>
+<% emt('Showing [_1] most recent of [quant,_2,total message]', $maxrecords, $total) %>
   <A HREF="<%$p%>search/cust_msg.html?custnum=<%$custnum%>">
-  <i>(<% mt('view all') %>)</i>
+  <i>(<% emt('view all') %>)</i>
   </A>
 %   } else {
-<% mt('[quant,_1,total message]', $total) %>
+<% emt('[quant,_1,total message]', $total) %>
 %   }
 <BR>
 <& /elements/table-grid.html &>
   <TR>
-    <TH CLASS="grid"><% mt('Date') %></TH>
-    <TH CLASS="grid"><% mt('Type') %></TH>
-    <TH CLASS="grid"><% mt('Destination') %></TH>
-    <TH CLASS="grid"><% mt('Subject') %></TH>
+    <TH CLASS="grid"><% emt('Date') %></TH>
+    <TH CLASS="grid"><% emt('Type') %></TH>
+    <TH CLASS="grid"><% emt('Destination') %></TH>
+    <TH CLASS="grid"><% emt('Subject') %></TH>
     <TH CLASS="grid"></TH>
   </TR>
 %   my $i = 0;

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index c7abd46..c65263d 100644 (file)
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -283,7 +283,7 @@
 
 % if ( @cust_pkg_usage ) {
   <TABLE CLASS="usage inv">
-    <TR><TH COLSPAN=4><% mt('Included usage') %></TH></TR>
+    <TR><TH COLSPAN=4><% emt('Included usage') %></TH></TR>
 %   foreach my $usage (@cust_pkg_usage) {
 %     my $part = $usage->part_pkg_usage;
 %     my $ratio = 255 * ($usage->minutes / $part->minutes);