internationalization/localization, RT12515

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 975d02a..007f593 100644 (file)
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -1,32 +1,30 @@
-<% include( 'elements/search.html',
-                 'title'       => 'Line items',
-                 'name'        => 'line items',
+<& elements/search.html,
+                 'title'       => emt('Line items'),
+                 'name'        => emt('line items'),

                  'query'       => $query,
                  'count_query' => $count_query,
                  'count_addl'  => [ $money_char. '%.2f total',
                                     $unearned ? ( $money_char. '%.2f unearned revenue' ) : (),
                                   ],
                  'header'      => [
                  'query'       => $query,
                  'count_query' => $count_query,
                  'count_addl'  => [ $money_char. '%.2f total',
                                     $unearned ? ( $money_char. '%.2f unearned revenue' ) : (),
                                   ],
                  'header'      => [

-                   #'#',
-                   'Description',
+                   emt('Description'),

                    ( $unearned
                    ( $unearned

-                     ? ( 'Unearned', 'Owed', 'Payment date' )
-                     : ( 'Setup charge' )
+                     ? ( emt('Unearned'), emt('Owed'), emt('Payment date') )
+                     : ( emt('Setup charge') )

                    ),
                    ( $use_usage eq 'usage'
                    ),
                    ( $use_usage eq 'usage'

-                     ? 'Usage charge'
-                     : 'Recurring charge'
+                     ? emt('Usage charge')
+                     : emt('Recurring charge')

                    ),
                    ( $unearned
                    ),
                    ( $unearned

-                     ? ( 'Charge start', 'Charge end' )
+                     ? ( emt('Charge start'), emt('Charge end') )

                      : ()
                    ),
                      : ()
                    ),

-                   'Invoice',
-                   'Date',
+                   emt('Invoice'),
+                   emt('Date'),

                    FS::UI::Web::cust_header(),
                  ],
                  'fields'      => [
                    FS::UI::Web::cust_header(),
                  ],
                  'fields'      => [

-                   #'billpkgnum',

                    sub { $_[0]->pkgnum > 0
                            ? $_[0]->get('pkg')      # possibly use override.pkg
                            : $_[0]->get('itemdesc') # but i think this correct
                    sub { $_[0]->pkgnum > 0
                            ? $_[0]->get('pkg')      # possibly use override.pkg
                            : $_[0]->get('itemdesc') # but i think this correct


@@ -127,8 +125,7 @@
                               '',
                               FS::UI::Web::cust_styles(),
                             ],
                               '',
                               FS::UI::Web::cust_styles(),
                             ],

-           )
-%>
+&>

 <%init>
 
 #LOTS of false laziness below w/cust_credit_bill_pkg.cgi
 <%init>
 
 #LOTS of false laziness below w/cust_credit_bill_pkg.cgi

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 43f112f..9172570 100755 (executable)
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -1,10 +1,9 @@
-<% include( 'elements/search.html',
+<& elements/search.html,

                  'title'       => $title,
                  'title'       => $title,

-                 'name'        => 'credits',
+                 'name'        => emt('credits'),

                  'query'       => $sql_query,
                  'count_query' => $count_query,
                  'count_addl'  => \@count_addl,
                  'query'       => $sql_query,
                  'count_query' => $count_query,
                  'count_addl'  => \@count_addl,

-                 #'redirect'    => $link,

                  'header'      => \@header,
                  'fields'      => \@fields,
                  'sort_fields' => \@sort_fields,
                  'header'      => \@header,
                  'fields'      => \@fields,
                  'sort_fields' => \@sort_fields,


@@ -12,8 +11,7 @@
                  'links' => \@links,
                  'color' => \@color,
                  'style' => \@style,
                  'links' => \@links,
                  'color' => \@color,
                  'style' => \@style,

-      )
-%>
+&>

 <%init>
 
 die "access denied"
 <%init>
 
 die "access denied"


@@ -21,11 +19,10 @@ die "access denied"
 
 my $money_char = FS::Conf->new->config('money_char') || '$';
 
 
 my $money_char = FS::Conf->new->config('money_char') || '$';
 

-my $title = 'Credit Search Results';
-#my( $count_query, $sql_query );
+my $title = emt('Credit Search Results');

 
 my $unapplied = $cgi->param('unapplied');
 
 my $unapplied = $cgi->param('unapplied');

-$title = "Unapplied $title" if $unapplied;
+$title = emt("Unapplied $title") if $unapplied;

 my $clink = sub {
   my $cust_bill = shift;
   $cust_bill->cust_main_custnum
 my $clink = sub {
   my $cust_bill = shift;
   $cust_bill->cust_main_custnum


@@ -37,7 +34,7 @@ my (@header, @fields, @sort_fields, $align, @links, @color, @style);
 $align = '';
 
 #amount
 $align = '';
 
 #amount

-push @header, 'Amount';
+push @header, emt('Amount');

 push @fields, sub { $money_char .sprintf('%.2f', shift->amount) };
 push @sort_fields, 'amount';
 $align .= 'r';
 push @fields, sub { $money_char .sprintf('%.2f', shift->amount) };
 push @sort_fields, 'amount';
 $align .= 'r';


@@ -47,7 +44,7 @@ push @style, '';
 
 # unapplied amount
 if ($unapplied) {
 
 # unapplied amount
 if ($unapplied) {

-  push @header, 'Unapplied';
+  push @header, emt('Unapplied');

   push @fields, sub { $money_char .sprintf('%.2f', shift->unapplied_amount) };
   push @sort_fields, '';
   $align .= 'r';
   push @fields, sub { $money_char .sprintf('%.2f', shift->unapplied_amount) };
   push @sort_fields, '';
   $align .= 'r';


@@ -56,9 +53,9 @@ if ($unapplied) {
   push @style, '';
 }
 
   push @style, '';
 }
 

-push @header, 'Date', 
-              'By',
-              'Reason',
+push @header, emt('Date'), 
+              emt('By'),
+              emt('Reason'),

               FS::UI::Web::cust_header(),
               ;
 push @fields, sub { time2str('%b %d %Y', shift->_date ) },
               FS::UI::Web::cust_header(),
               ;
 push @fields, sub { time2str('%b %d %Y', shift->_date ) },

diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html
index 65bd39e..03474c1 100755 (executable)
--- a/httemplate/search/cust_pay.html
+++ b/httemplate/search/cust_pay.html
@@ -1,7 +1,6 @@
-<% include( 'elements/cust_pay_or_refund.html',
+<& elements/cust_pay_or_refund.html,

                 'thing'         => 'pay',
                 'amount_field'  => 'paid',
                 'thing'         => 'pay',
                 'amount_field'  => 'paid',

-                'name_singular' => 'payment',
-                'name_verb'     => 'paid',
-          )
-%>
+                'name_singular' => emt('payment'),
+                'name_verb'     => emt('paid'),
+&>