From 16c3fc46b67dc42c0404fc93aa54ce61be5f08f9 Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Wed, 18 May 2011 01:49:08 +0000
Subject: [PATCH] internationalization/localization, RT12515

---
 httemplate/search/cust_main.html   | 11 +++++------
 httemplate/search/cust_refund.html |  9 ++++-----
 httemplate/search/cust_svc.html    | 13 ++++++-------
 httemplate/search/svc_acct.cgi     | 22 ++++++++++------------
 4 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 04ecf894a..693996ed5 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -1,7 +1,7 @@
-<% include( 'elements/search.html',
-                  'title'       => 'Customer Search Results', 
+<& elements/search.html,
+                  'title'       => emt('Customer Search Results'), 
                   'menubar'     => $menubar,
-                  'name'        => 'customers',
+                  'name'        => emt('customers'),
                   'query'       => $sql_query,
                   'count_query' => $count_query,
                   'header'      => [ FS::UI::Web::cust_header(
@@ -29,8 +29,7 @@
                                      ),
                                      map '', @extra_fields
                                    ],
-              )
-%>
+&>
 <%init>
 
 die "access denied"
@@ -105,7 +104,7 @@ if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') )
   $uri->query_form( \%search_hash );
   my $query = $uri->query;
 
-  push @$menubar, 'Email a notice to these customers' =>
+  push @$menubar, emt('Email a notice to these customers') =>
                     "${p}misc/email-customers.html?table=cust_main&$query",
 
 }
diff --git a/httemplate/search/cust_refund.html b/httemplate/search/cust_refund.html
index e31e088eb..95359b2af 100644
--- a/httemplate/search/cust_refund.html
+++ b/httemplate/search/cust_refund.html
@@ -1,7 +1,6 @@
-<% include( 'elements/cust_pay_or_refund.html',
+<& elements/cust_pay_or_refund.html,
                 'thing'         => 'refund',
                 'amount_field'  => 'refund',
-                'name_singular' => 'refund',
-                'name_verb'     => 'refunded',
-          )
-%>
+                'name_singular' => emt('refund'),
+                'name_verb'     => emt('refunded'),
+&>
diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index a2cdc8a2d..72ecb8e35 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -1,11 +1,11 @@
-<% include( 'elements/search.html',
-              'title'       => 'Service search results',
-	      'name'        => 'services',
+<& elements/search.html,
+          'title'       => emt('Service search results'),
+	      'name'        => emt('services'),
 	      'query'       => $sql_query,
 	      'count_query' => $count_query,
 	      'redirect'    => $link,
-	      'header'      => [ '#',
-	                         'Service',
+	      'header'      => [ emt('#'),
+	                         emt('Service'),
 				 # package?
 				 FS::UI::Web::cust_header(),
 	                       ],
@@ -36,8 +36,7 @@
                            '',
                            FS::UI::Web::cust_styles(),
                          ],
-          )
-%>
+&>
 <%init>
 
 die "access denied"
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index c3ddd660b..12d5991ea 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,6 +1,6 @@
-<% include( 'elements/search.html',
-                 'title'       => 'Account Search Results',
-                 'name'        => 'accounts',
+<& elements/search.html,
+                 'title'       => emt('Account Search Results'),
+                 'name'        => emt('accounts'),
                  'query'       => $sql_query,
                  'count_query' => $count_query,
                  'redirect'    => $link,
@@ -11,8 +11,7 @@
                  'color'       => \@color,
                  'style'       => \@style,
                  'footer'      => \@footer,
-             )
-%>
+&>
 <%once>
 
 #false laziness w/ClientAPI/MyAccount.pm
@@ -83,7 +82,7 @@ if ( $conf->exists('report-showpasswords') #its a terrible idea
      && $curuser->access_right('List service passwords') #but if you insist...
    )
 {
-  push @header, 'Password';
+  push @header, emt('Password');
   push @fields, 'get_cleartext_password';
   push @links, $link;
   $align .= 'l';
@@ -91,7 +90,7 @@ if ( $conf->exists('report-showpasswords') #its a terrible idea
   push @style, '';
 }
 
-push @header, 'Real Name';
+push @header, emt('Real Name');
 push @fields, 'finger';
 push @links, $link;
 $align .= 'l';
@@ -100,7 +99,7 @@ push @style, '';
 
 #hide the UID, its much less useful these days
 if ( $cgi->param('show_uid') ) { #XXX add a checkbox
-  push @header, 'UID';
+  push @header, emt('UID');
   push @fields, 'uid';
   push @links, $link;
   $align .= 'l';
@@ -108,7 +107,7 @@ if ( $cgi->param('show_uid') ) { #XXX add a checkbox
   push @style, '';
 }
 
-push @header, 'Last Login';
+push @header, emt('Last Login');
 push @fields, 'last_login_text';
 push @links, $link;
 $align .= 'r';
@@ -140,8 +139,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   if ( $sortby eq 'seconds' ) {
     my $tot_time = 0;
-    #push @header, 'Time remaining';
-    push @header, 'Time';
+    push @header, emt('Time');
     push @fields, sub { my $svc_acct = shift;
                         $tot_time += $svc_acct->seconds;
                         format_time($svc_acct->seconds);
@@ -158,7 +156,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
     if ( $conf->exists('svc_acct-display_paid_time_remaining') ) {
       my $tot_paid_time = 0;
       my %tot = ( '30'=>0, '60'=>0, '90'=>0 );
-      push @header, 'Paid time', 'Last 30', 'Last 60', 'Last 90';
+      push @header, emt('Paid time'), emt('Last 30'), emt('Last 60'), emt('Last 90');
       push @fields,
         sub {
           my $svc_acct = shift;
-- 
2.11.0