[freeside-commits] branch master updated. 4b05b20576ddb14577d59c87c8257c6804449410

Thu Aug 18 14:52:51 PDT 2016

The branch, master has been updated
 via 4b05b20576ddb14577d59c87c8257c6804449410 (commit)
 via f2ba5664d92a76d9de3651cd90636af5188cdb9b (commit)
 via 8d7ab62d235daafc6b9ff8bd5d10928f90b43ab0 (commit)
 via 328be1bbd5bdf114568ed9c452c511670b41e66c (commit)
 from a2ecb1cf6a6c084c521710f1256da082f70ba9e5 (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 4b05b20576ddb14577d59c87c8257c6804449410
Merge: a2ecb1c f2ba566
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Aug 18 14:52:35 2016 -0700

 localize header / merge github#56

diff --cc httemplate/elements/header-full.html
index 850eaed,27b6628..6d90d50
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@@ -70,13 -61,10 +70,13 @@@ Example
 <td align=left BGCOLOR="#ffffff"> 
 <% $company_name || 'ExampleCo' %>
 </td>
 - <td align=right valign=top BGCOLOR="#ffffff"><% mt("Logged in as") %> <% $FS::CurrentUser::CurrentUser->username |h %>  <a href="<%$fsurl%>loginout/logout.html"><% mt("logout") %></a> <a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000"><% mt("Preferences") %></a>
 + <td align="right" BGCOLOR="#ffffff">
 + <& notify-tickets.html &>
 + </td>
- <td align=right valign=top BGCOLOR="#ffffff">Logged in as <% $FS::CurrentUser::CurrentUser->username |h %>  <a href="<%$fsurl%>loginout/logout.html">logout</a> <a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
++ <td align=right valign=top BGCOLOR="#ffffff"><% mt('Logged in as') |h %><% $FS::CurrentUser::CurrentUser->username |h %>  <a href="<%$fsurl%>loginout/logout.html"><% mt('logout' |h %></a> <a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000"><% mt('Preferences') |h %></a>
 % if ( $conf->config("ticket_system")
 % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
- | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a>
 - | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000"><% mt("Ticketing preferences") %></a>
++ | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000"><% mt('Ticketing preferences') |h %></a>
 % }
 
 </td>

commit f2ba5664d92a76d9de3651cd90636af5188cdb9b
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date: Mon Dec 23 14:33:56 2013 -0300

 - Localize search bar.

diff --git a/httemplate/elements/searchbar-address2.html b/httemplate/elements/searchbar-address2.html
index 5f3b1f2..047db89 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="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") %>" 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 %>
 
@@ -20,7 +20,7 @@
 </SCRIPT>
 <%once>
 
-my $address2_label = '(Unit #)';
+my $address2_label = mt('(Unit #)');
 
 </%once>
 <%init> 
diff --git a/httemplate/elements/searchbar-cust_svc.html b/httemplate/elements/searchbar-cust_svc.html
index e4c2dc6..8d5ca40 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="<% $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="<% mt("$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,7 +12,7 @@
 <SCRIPT TYPE="text/javascript">
 
   function clearhint_search_svc (what) {
-    if ( what.value == '<% $svc_label |n %>' )
+    if ( what.value == '<% mt("$svc_label |n") %>' )
       what.value = '';
   }
 
diff --git a/httemplate/elements/searchbar-prospect.html b/httemplate/elements/searchbar-prospect.html
index a604467..25883bb 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="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") %>" 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 %>
 
@@ -19,7 +19,7 @@
 </SCRIPT>
 <%once>
 
-my $prospect_label = '(name, company or phone)';
+my $prospect_label = mt('(name, company or phone)');
 
 </%once>
 <%init>

commit 8d7ab62d235daafc6b9ff8bd5d10928f90b43ab0
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Mon Dec 23 18:18:32 2013 -0300

    - Localize Main Menu

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index c385cb4..e735c52 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -980,11 +980,11 @@ sub submenu {
           my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
 
           "$subhtml\n".
-          "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
+          "myMenu$menunum.add(new WebFXMenuItem(\"".mt($_)."\", null, \"".mt($tooltip)."\", $submenuname ));";
 
         } else {
 
-          "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
+          "myMenu$menunum.add(new WebFXMenuItem(\"".mt($_)."\", \"$url_or_submenu\", \"".mt($tooltip)."\" ));";
 
         }
 

commit 328be1bbd5bdf114568ed9c452c511670b41e66c
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Mon Dec 30 01:45:03 2013 -0300

    - Localize header.

diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index c8a83ca..27b6628 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -61,10 +61,10 @@ Example:
         <td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
           <font size=6><% $company_name || 'ExampleCo' %></font>
         </td>
-        <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% $FS::CurrentUser::CurrentUser->username |h %> </b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
+        <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1"><% mt("Logged in as") %> <b><% $FS::CurrentUser::CurrentUser->username |h %> </b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html"><% mt("logout") %></a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000"><% mt("Preferences") %></a>
 %         if ( $conf->config("ticket_system")
 %              && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
-            | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a>
+            | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000"><% mt("Ticketing preferences") %></a>
 %         }
           <BR></FONT>
         </td>

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

Summary of changes:
 httemplate/elements/header-full.html        |    4 ++--
 httemplate/elements/menu.html               |    4 ++--
 httemplate/elements/searchbar-address2.html |    4 ++--
 httemplate/elements/searchbar-cust_svc.html |    4 ++--
 httemplate/elements/searchbar-prospect.html |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)


