[freeside-commits] freeside/httemplate/search report_cust_bill.html, 1.12, 1.13 report_cust_main.html, 1.18, 1.19

Erik Levinson levinse at wavetail.420.am
Sat May 21 11:24:22 PDT 2011 

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv7960/search

Modified Files:
	report_cust_bill.html report_cust_main.html 
Log Message:
internationalization/localization, RT12515

Index: report_cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_bill.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- report_cust_bill.html	28 Aug 2010 00:18:27 -0000	1.12
+++ report_cust_bill.html	21 May 2011 18:24:20 -0000	1.13
@@ -1,55 +1,51 @@
-<% include('/elements/header.html', 'Invoice Report' ) %>
+<& /elements/header.html, emt('Invoice Report') &>
 
 <FORM ACTION="cust_bill.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
 
 <TABLE BGCOLOR="#cccccc" CELLSPACING=0
 
-  <% include( '/elements/tr-select-agent.html',
+  <& /elements/tr-select-agent.html,
                  'curr_value'    => scalar( $cgi->param('agentnum') ),
-                 'label'         => 'Invoices for agent: ',
+                 'label'         => emt('Invoices for agent: '),
                  'disable_empty' => 0,
-             )
-  %>
+  &>
 
-  <% include( '/elements/tr-input-beginning_ending.html' ) %>
+  <& /elements/tr-input-beginning_ending.html &>
 
-  <% include( '/elements/tr-input-lessthan_greaterthan.html',
-                label   => 'Charged',
+  <& /elements/tr-input-lessthan_greaterthan.html,
+                label   => emt('Charged'),
                 field   => 'charged',
-            )
-  %>
+  &>
 
-  <% include( '/elements/tr-input-lessthan_greaterthan.html',
-                label   => 'Owed',
+  <& /elements/tr-input-lessthan_greaterthan.html,
+                label   => emt('Owed'),
                 field   => 'owed',
-            )
-  %>
-  <% include( '/elements/tr-select-payby.html',
-                label   => 'Payment method:',
+  &>
+  <& /elements/tr-select-payby.html,
+                label   => emt('Payment method:'),
                 payby_type   => 'cust',
                 multiple     => 1,
                 all_selected => 1,
-            )
-  %>
+  &>
 
   <TR>
     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
-    <TD>Show only open invoices</TD>
+    <TD><% mt('Show only open invoices') |h %></TD>
   </TR>
   <TR>
     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
-    <TD>Show only the single most recent invoice per-customer</TD>
+    <TD><% mt('Show only the single most recent invoice per-customer') |h %></TD>
   </TR>
 
 </TABLE>
 
 <BR>
-<INPUT TYPE="submit" VALUE="Get Report">
+<INPUT TYPE="submit" VALUE="<% mt('Get Report') |h %>">
 
 </FORM>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 <%init>
 
 die "access denied"

Index: report_cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_main.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -d -r1.18 -r1.19
--- report_cust_main.html	8 Nov 2010 17:48:08 -0000	1.18
+++ report_cust_main.html	21 May 2011 18:24:20 -0000	1.19
@@ -1,4 +1,4 @@
-<% include('/elements/header.html', 'Customer Report' ) %>
+<& /elements/header.html, emt('Customer Report') &>
 
 <FORM ACTION="cust_main.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
@@ -6,66 +6,56 @@
   <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
 
     <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
+      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Search options') |h %></FONT></TH>
     </TR>
 
-    <% include( '/elements/tr-select-agent.html',
+    <& /elements/tr-select-agent.html,
                   'curr_value'    => scalar($cgi->param('agentnum')),
                   'disable_empty' => 0,
-               )
-    %>
+    &>
 
-    <% include( '/elements/tr-select-cust_main-status.html',
-                  'label' => 'Status'
-              )
-    %>
+    <& /elements/tr-select-cust_main-status.html,
+                  'label' => emt('Status'),
+    &>
 
-    <% include( '/elements/tr-select-cust_class.html',
-                  'label'        => 'Class',
+    <& /elements/tr-select-cust_class.html,
+                  'label'        => emt('Class'),
                   'multiple'     => 1,
-                  'pre_options'  => [ '' => '(none)' ],
+                  'pre_options'  => [ '' => emt('(none)') ],
                   'all_selected' => 1,
-              )
-    %>
+    &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center">Address</TD>
+      <TD ALIGN="right" VALIGN="center"><% mt('Address') |h %></TD>
       <TD><INPUT TYPE="text" NAME="address" SIZE=54></TD>
     </TR>
 
-%   foreach my $field (qw( signupdate )) {
-
       <TR>
-        <TD ALIGN="right" VALIGN="center"><% $label{$field} %></TD>
+        <TD ALIGN="right" VALIGN="center"><% mt('Signup date') |h %></TD>
         <TD>
           <TABLE>
-            <% include( '/elements/tr-input-beginning_ending.html',
-                          prefix   => $field,
+            <& /elements/tr-input-beginning_ending.html,
+                      prefix   => 'signupdate',
                           layout   => 'horiz',
-                      )
-            %>
+            &>
           </TABLE>
         </TD>
       </TR>
 
-%   }
-
-    <% include( '/elements/tr-select-cust_tag.html',
+    <& /elements/tr-select-cust_tag.html,
 		  'cgi'		 => $cgi,
 		  'is_report'    => 1,
                   'multiple'     => 1,
-              )
-    %>
+    &>
 
-    <% include( '/elements/tr-select-payby.html',
+    <& /elements/tr-select-payby.html,
                   'payby_type'   => 'cust',
                   'multiple'     => 1,
                   'all_selected' => 1,
-              )
-    %>
+    &>
 
     <TR>
-      <TD ALIGN="right">Payment expiration before</TD>
+      <TD ALIGN="right"><% mt('Payment expiration before') |h %></TD>
       <TD>
         <SELECT NAME="paydate_month" DISABLED>
 %         foreach my $month ( 1 .. 12 ) {
@@ -96,36 +86,34 @@
     </SCRIPT>
  
     <TR>
-      <TD ALIGN="right">Invoice terms</TD>
+      <TD ALIGN="right"><% mt('Invoice terms') |h %></TD>
       <TD>
-        <% include( '/elements/select-terms.html',
-                      'pre_options' => [ '' => 'all' ],
+        <& /elements/select-terms.html,
+                      'pre_options' => [ '' => emt('all') ],
                       'empty_value' => 'NULL',
-                  )
-        %>
+        &>
       </TD>
     </TR>
     
-    <% include( '/elements/tr-input-lessthan_greaterthan.html',
-                  label   => 'Current balance',
+    <& /elements/tr-input-lessthan_greaterthan.html,
+                  label   => emt('Current balance'),
                   field   => 'current_balance',
-              )
-    %>
+    &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center">Include cancelled packages</TD>
+      <TD ALIGN="right" VALIGN="center"><% mt('Include cancelled packages') |h %></TD>
         <TD><INPUT TYPE="checkbox" NAME="cancelled_pkgs"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center">Without census tract</TD>
+      <TD ALIGN="right" VALIGN="center"><% mt('Without census tract') |h %></TD>
         <TD><INPUT TYPE="checkbox" NAME="no_censustract"></TD>
     </TR>
 
 %   if ( $conf->exists('enable_taxproducts') ) {
 
       <TR>
-        <TD ALIGN="right" VALIGN="center">With hardcoded tax location</TD>
+        <TD ALIGN="right" VALIGN="center"><% mt('With hardcoded tax location') |h %></TD>
           <TD><INPUT TYPE="checkbox" NAME="with_geocode"></TD>
       </TR>
 
@@ -136,22 +124,22 @@
     </TR>
 
     <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Display options</FONT></TH>
+      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Display options') |h %></FONT></TH>
     </TR>
-    <% include( '/elements/tr-select-cust-fields.html' ) %>
+    <& /elements/tr-select-cust-fields.html &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center">Add package columns</TD>
+      <TD ALIGN="right" VALIGN="center"><% mt('Add package columns') |h %></TD>
         <TD><INPUT TYPE="checkbox" NAME="flattened_pkgs"></TD>
     </TR>
   </TABLE>
 
 <BR>
-<INPUT TYPE="submit" VALUE="Get Report">
+<INPUT TYPE="submit" VALUE="<% mt('Get Report') |h %>">
 
 </FORM>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 <%init>
 
 die "access denied"
@@ -162,10 +150,3 @@
 my $conf = new FS::Conf;
 
 </%init>
-<%once>
-
-my %label = (
-  'signupdate'     => 'Signup date',
-);
-
-</%once>

More information about the freeside-commits mailing list