internationalization/localization, RT12515

3 files changed, 35 insertions, 45 deletions

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 4e40fb06d..4f73aaf84 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,5 +1,5 @@
-<% include( 'elements/search.html',
-                 'title'       => 'Invoice Search Results',
+<& elements/search.html,
+                 'title'       => emt('Invoice Search Results'),
                  'html_init'   => $html_init,
                  'menubar'     => $menubar,
                  'name'        => 'invoices',
@@ -7,11 +7,11 @@
                  'count_query' => $count_query,
                  'count_addl'  => $count_addl,
                  'redirect'    => $link,
-                 'header'      => [ 'Invoice #',
-                                    'Balance',
-                                    'Net Amount',
-                                    'Gross Amount',
-                                    'Date',
+                 'header'      => [ emt('Invoice #'),
+                                    emt('Balance'),
+                                    emt('Net Amount'),
+                                    emt('Gross Amount'),
+                                    emt('Date'),
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [
@@ -56,10 +56,7 @@
                               '',
                               FS::UI::Web::cust_styles(),
                             ],
-
-  
-      )
-%>
+&>
 <%init>
 
 die "access denied"
@@ -71,7 +68,6 @@ my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
 
 my( $count_query, $sql_query );
 my $count_addl = '';
-#my $distinct = '';
 my %search;
 
 if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
@@ -82,7 +78,6 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
   $count_query = "SELECT COUNT(*) FROM cust_bill $join_cust_main $where";
 
   $sql_query = {
-    #'select'    => '*',
     'table'     => 'cust_bill',
     'addl_from' => $join_cust_main,
     'hashref'   => {},
@@ -159,7 +154,6 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
     'table'     => 'cust_bill',
     'addl_from' => $join_cust_main,
     'hashref'   => {},
-    #'select'    => "$distinct ". join(', ',
     'select'    => join(', ',
                      'cust_bill.*',
                      #( map "cust_main.$_", qw(custnum last first company) ),
@@ -207,31 +201,31 @@ my $html_init = join("\n", map {
 '<SCRIPT TYPE="text/javascript">
 
 function confirm_print_process() {
-  if ( ! confirm("Are you sure you want to reprint these invoices?") ) {
+  if ( ! confirm('.emt("Are you sure you want to reprint these invoices?").') ) {
     return;
   }
   print_process();
 }
 function confirm_email_process() {
-  if ( ! confirm("Are you sure you want to re-email these invoices?") ) {
+  if ( ! confirm('.emt("Are you sure you want to re-email these invoices?").') ) {
     return;
   }
   email_process();
 }
 function confirm_fax_process() {
-  if ( ! confirm("Are you sure you want to re-fax these invoices?") ) {
+  if ( ! confirm('.emt("Are you sure you want to re-fax these invoices?").') ) {
     return;
   }
   fax_process();
 }
 function confirm_ftp_process() {
-  if ( ! confirm("Are you sure you want to re-FTP these invoices?") ) {
+  if ( ! confirm('.emt("Are you sure you want to re-FTP these invoices?").') ) {
     return;
   }
   ftp_process();
 }
 function confirm_spool_process() {
-  if ( ! confirm("Are you sure you want to re-spool these invoices?") ) {
+  if ( ! confirm('.emt("Are you sure you want to re-spool these invoices?").') ) {
     return;
   }
   spool_process();
@@ -243,20 +237,20 @@ my $menubar = [];
 
 if ( $FS::CurrentUser::CurrentUser->access_right('Resend invoices') ) {
 
-  push @$menubar, 'Print these invoices' =>
+  push @$menubar, emt('Print these invoices') =>
                     "javascript:confirm_print_process()",
-                  'Email these invoices' =>
+                  emt('Email these invoices') =>
                     "javascript:confirm_email_process()";
 
-  push @$menubar, 'Fax these invoices' =>
+  push @$menubar, emt('Fax these invoices') =>
                     "javascript:confirm_fax_process()"
     if $conf->exists('hylafax');
 
-  push @$menubar, 'FTP these invoices' =>
+  push @$menubar, emt('FTP these invoices') =>
                     "javascript:confirm_ftp_process()"
     if $conf->exists('cust_bill-ftpformat');
 
-  push @$menubar, 'Spool these invoices' =>
+  push @$menubar, emt('Spool these invoices') =>
                     "javascript:confirm_spool_process()"
     if $conf->exists('cust_bill-spoolformat');
 
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 16a75ebf4..50a5bfcf8 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -1,4 +1,4 @@
-<% include('/elements/header.html', $title ) %>
+<& /elements/header.html, emt($title) &>
 
 <FORM ACTION="cust_credit.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
@@ -6,35 +6,32 @@
 
 <TABLE>
 
-  <% include( '/elements/tr-select-user.html',
-                'label'       => 'Credits by employee: ',
+  <& /elements/tr-select-user.html,
+                'label'       => emt('Credits by employee: '),
                 'access_user' => \%access_user,
-            )
-  %>
+  &>
 
-  <% include( '/elements/tr-select-agent.html',
+  <& /elements/tr-select-agent.html,
                  'curr_value'    => scalar( $cgi->param('agentnum') ),
-                 'label'         => 'for agent: ',
+                 'label'         => emt('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' => 'Amount',
-		'field' => 'amount',
-            )
-  %>
+  <& /elements/tr-input-lessthan_greaterthan.html,
+                'label' => emt('Amount'),
+                'field' => 'amount',
+  &>
 
 </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>
 
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index ea7a215fa..eca3d0975 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -1,5 +1,4 @@
-<% include( 'elements/report_cust_pay_or_refund.html',
+<& elements/report_cust_pay_or_refund.html,
               'thing'          => 'pay',
-              'name_singular'  => 'payment',
-          )
-%>
+              'name_singular'  => emt('payment'),
+&>