[freeside-commits] branch master updated. 0a5585fba67aaa55301fe585a75aae1106aea1e6

[Ivan]

The branch, master has been updated
       via  0a5585fba67aaa55301fe585a75aae1106aea1e6 (commit)
      from  017a6460130be41bb563318b28ab61115d1cfb35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0a5585fba67aaa55301fe585a75aae1106aea1e6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Sep 25 12:29:45 2016 -0700

    fix translation escaping

diff --git a/httemplate/edit/cust_main/name.html b/httemplate/edit/cust_main/name.html
index 9c6a24b..713f54c 100644
--- a/httemplate/edit/cust_main/name.html
+++ b/httemplate/edit/cust_main/name.html
@@ -2,7 +2,7 @@
 % my ($field, $value, $label, $extra) = @_;
 <DIV STYLE="display: inline-block" ID="<% $field %>_input">
   <INPUT TYPE="text" NAME="<% $field %>" VALUE="<% $value |h %>" <%$extra%>>
-  <BR><FONT SIZE="-1" COLOR="#333333"><% mt($label) %></FONT>
+  <BR><FONT SIZE="-1" COLOR="#333333"><% emt($label) %></FONT>
 </DIV>
 </%def>
 
diff --git a/httemplate/elements/searchbar-address2.html b/httemplate/elements/searchbar-address2.html
index 047db89..eb1fd06 100644
--- a/httemplate/elements/searchbar-address2.html
+++ b/httemplate/elements/searchbar-address2.html
@@ -4,7 +4,7 @@
     <INPUT TYPE="hidden" NAME="address2_on" VALUE="1">
     <INPUT NAME="address2_text" TYPE="text" VALUE="<% $address2_label |n %>" STYLE="width:67px" onFocus="clearhint_search_address2(this);" onClick="clearhint_search_address2(this);" CLASS="fstext">
     <BR>
-    <INPUT TYPE="submit" VALUE="<% mt("Search units") %>" 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 units") |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>' : '' |n %>
 
diff --git a/httemplate/elements/searchbar-cust_svc.html b/httemplate/elements/searchbar-cust_svc.html
index 8d5ca40..36fb9b2 100644
--- a/httemplate/elements/searchbar-cust_svc.html
+++ b/httemplate/elements/searchbar-cust_svc.html
@@ -1,7 +1,7 @@
 % if ( $curuser->access_right('View customer services') ) {
 
   <FORM ACTION="<%$fsurl%>search/cust_svc.html" METHOD="GET" STYLE="margin:0">
-    <INPUT NAME="search_svc" TYPE="text" VALUE="<% mt("$svc_label |n") %>" STYLE="width:<% $width %>" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" CLASS="fstext"><BR>
+    <INPUT NAME="search_svc" TYPE="text" VALUE="<% $svc_label |n %>" STYLE="width:<% $width %>" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" CLASS="fstext"><BR>
     <A NOTYET="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #cccccc; font-size:11px"><% mt('Advanced') |h %></A>
     <INPUT TYPE="submit" VALUE="<% mt('Search services') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
   </FORM>
@@ -12,14 +12,14 @@
 <SCRIPT TYPE="text/javascript">
 
   function clearhint_search_svc (what) {
-    if ( what.value == '<% mt("$svc_label |n") %>' )
+    if ( what.value == '<% $svc_label |n %>' )
       what.value = '';
   }
 
 </SCRIPT>
 <%once>
 
-my $svc_label = '(user, email, ip, mac, domain or service phone)';
+my $svc_label = mt('(user, email, ip, mac, domain or service phone)');
 
 </%once>
 <%init>
diff --git a/httemplate/elements/searchbar-prospect.html b/httemplate/elements/searchbar-prospect.html
index 25883bb..e5ca430 100644
--- a/httemplate/elements/searchbar-prospect.html
+++ b/httemplate/elements/searchbar-prospect.html
@@ -3,7 +3,7 @@
   <FORM ACTION="<%$fsurl%>search/prospect_main.html" METHOD="GET" STYLE="margin:0">
     <INPUT NAME="search_prospect" TYPE="text" VALUE="<% $prospect_label |n %>" STYLE="width:<%$width%>" onFocus="clearhint_search_prospect(this);" onClick="clearhint_search_prospect(this);" CLASS="fstext"><BR>
     <A HREF="<%$fsurl%>search/report_prospect_main.html" CLASS="fslink" STYLE="font-size: 11px"><% mt('Adv') |h %></A>
-    <INPUT TYPE="submit" VALUE="<% mt("Search prospects") %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px">
+    <INPUT TYPE="submit" VALUE="<% mt("Search prospects") |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">
   </FORM>
   <% $menu_position eq 'left' ? '<BR>' : '' |n %>
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/cust_main/name.html         |    2 +-
 httemplate/elements/searchbar-address2.html |    2 +-
 httemplate/elements/searchbar-cust_svc.html |    6 +++---
 httemplate/elements/searchbar-prospect.html |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)