internationalization/localization, RT12515

4 files changed, 49 insertions, 50 deletions

diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index 40a7de59f..5f36055d1 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -1,7 +1,7 @@
 <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
 
 % unless ( $cust_pkg->locationnum ) {
-  <I><FONT SIZE=-1>(default service address)</FONT><BR>
+  <I><FONT SIZE=-1>(<% mt('default service address') |h %>)</FONT><BR>
 % }
 
   <% $loc->location_label( 'join_string'     => '<BR>',
@@ -48,8 +48,8 @@ sub pkg_change_location_link {
     'action'      => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;".
                      "address1=;address2=;city=;county=;state=$statedefault;".
                      "zip=;country=$countrydefault",
-    'label'       => 'Change&nbsp;location',
-    'actionlabel' => 'Change',
+    'label'       => mt('Change location'),
+    'actionlabel' => mt('Change'),
     'cust_pkg'    => $cust_pkg,
   );
 }
@@ -58,8 +58,8 @@ sub edit_location_link {
   my $locationnum = shift;
   include( '/elements/popup_link.html',
     'action'      => $p. "edit/cust_location.cgi?locationnum=$locationnum",
-    'label'       => 'Edit&nbsp;location',
-    'actionlabel' => 'Edit',
+    'label'       => mt('Edit location'),
+    'actionlabel' => mt('Edit'),
   );
 }
 
diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 8cae5fdba..d6cee73d0 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -13,7 +13,7 @@
 % if ( $cust_pkg->quantity > 1 ) {
     <TR>
       <TD COLSPAN=2>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Quantity: 
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<% mt('Quantity:') |h %> 
         <B><% $cust_pkg->quantity %></B>
       </TD>
     </TR>
@@ -81,20 +81,20 @@
 
 %       if ( @invoice_detail ) {
           <TD VALIGN="top">
-            <% include('/elements/table-grid.html') %>
+            <& /elements/table-grid.html &>
               <TR>
                 <TH BGCOLOR="#dddddd" STYLE="border-bottom: dashed 1px black; padding-bottom: 1px">
                   <FONT SIZE="-1">
-                    Invoice details
+                    <% mt('Invoice details') |h %> 
 %                   if ( $editi && ! $cust_pkg->get('cancel') ) {
-                      (<% include('/elements/popup_link.html', { 
+                      (<& /elements/popup_link.html, { 
                                     'action'      => $editlink. 'I',
-                                    'label'       => 'edit',
-                                    'actionlabel' => 'Edit invoice details',
+                                    'label'       => mt('edit'),
+                                    'actionlabel' => mt('Edit invoice details'),
                                     'color'       => '#333399',
                                     'width'       => 763,
-                                 })
-                       %>)
+                                 }
+                       &>)
 %                   }
                   </FONT>
                 </TH>
@@ -112,8 +112,8 @@
               <FONT SIZE="-1">
                 (&nbsp;<% include('/elements/popup_link.html', { 
                                'action'      => $editlink. 'I',
-                               'label'       => 'Add&nbsp;invoice&nbsp;details',
-                               'actionlabel' => 'Add invoice details',
+                               'label'       => mt('Add invoice details'),
+                               'actionlabel' => mt('Add invoice details'),
                                'color'       => '#333399',
                                'width'       => 763,
                             })
@@ -125,20 +125,20 @@
 
 %       if ( @comments ) { 
           <TD VALIGN="top">
-            <% include('/elements/table-grid.html') %>
+            <& /elements/table-grid.html &>
               <TR>
                 <TH BGCOLOR="#dddddd" STYLE="border-bottom: dashed 1px black; padding-bottom: 1px">
                   <FONT SIZE="-1">
-                    Comments
+                    <% mt('Comments') |h %> 
 %                   if ( $editc ) {
-                      (<% include('/elements/popup_link.html', { 
+                      (<& /elements/popup_link.html, { 
                                     'action'      => $editlink. 'C',
-                                    'label'       => 'edit',
-                                    'actionlabel' => 'Edit comments',
+                                    'label'       => mt('edit'),
+                                    'actionlabel' => mt('Edit comments'),
                                     'color'       => '#333399',
                                     'width'       => 763,
-                                 })
-                       %>)
+                                 }
+                       &>)
 %                   }
                   </FONT>
                 </TH>
@@ -154,14 +154,14 @@
           <TD>
 %           if ( $editc ) {
               <FONT SIZE="-1">
-                (&nbsp;<% include('/elements/popup_link.html', { 
+                (&nbsp;<& /elements/popup_link.html, { 
                                'action'      => $editlink. 'C',
-                               'label'       => 'Add&nbsp;comments',
-                               'actionlabel' => 'Add comments',
+                               'label'       => mt('Add comments'),
+                               'actionlabel' => mt('Add comments'),
                                'color'       => '#333399',
                                'width'       => 763,
-                            })
-                  %>&nbsp;)
+                            }
+                  &>&nbsp;)
               </FONT>
 %           }
           </TD>
@@ -210,8 +210,8 @@ sub pkg_change_link {
   my $locationnum = $cust_pkg->locationnum;
   include( '/elements/popup_link-cust_pkg.html',
     'action'      => $p. "misc/change_pkg.cgi?locationnum=$locationnum",
-    'label'       => 'Change&nbsp;package',
-    'actionlabel' => 'Change',
+    'label'       => mt('Change package'),
+    'actionlabel' => mt('Change'),
     'cust_pkg'    => $cust_pkg,
   );
 }
@@ -223,8 +223,8 @@ sub pkg_change_location_link {
     'action'      => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;".
                      "address1=;address2=;city=;county=;state=$statedefault;".
                      "zip=;country=$countrydefault",
-    'label'       => 'Change&nbsp;location',
-    'actionlabel' => 'Change',
+    'label'       => mt('Change location'),
+    'actionlabel' => mt('Change'),
     'cust_pkg'    => $cust_pkg,
   );
 }
@@ -237,8 +237,8 @@ sub pkg_discount_link {
   #my $custnum = $cust_pkg->custnum;
   include( '/elements/popup_link-cust_pkg.html',
     'action'      => $p.'edit/cust_pkg_discount.html',
-    'label'       => 'Discount',
-    'actionlabel' => 'Discount',
+    'label'       => mt('Discount'),
+    'actionlabel' => mt('Discount'),
     'cust_pkg'    => $cust_pkg,
     'width'       => 616,
   );
@@ -251,13 +251,13 @@ sub pkg_customize_link {
   qq!<A HREF="${p}edit/part_pkg.cgi?!.
     "clone=". $part_pkg->pkgpart. ';'.
     "pkgnum=". $cust_pkg->pkgnum.
-    qq!">Customize</A>!;
+    qq!">!.mt('Customize').'</A>';
 }
 
 sub pkg_event_link {
   my($cust_pkg) = @_;
   qq!<a href="${p}search/cust_event.html?pkgnum=!. $cust_pkg->pkgnum. qq!">!.
-  'View package events'.
+  mt('View package events').
   '</a>';
 }
 
diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html
index 45365a003..4ac2e7779 100755
--- a/httemplate/view/cust_main/packages/section.html
+++ b/httemplate/view/cust_main/packages/section.html
@@ -5,12 +5,12 @@
 
 <TR>
 % #my $width = $show_location ? 'WIDTH="25%"' : 'WIDTH="33%"';
-  <TH CLASS="grid" BGCOLOR="#cccccc">Package</TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Package') |h %></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Status') |h %></TH>
 %   if ( $show_location ) {
-  <TH CLASS="grid" BGCOLOR="#cccccc">Location</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Location') |h %></TH>
 % }
-  <TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Services') |h %></TH>
 </TR>
 
 % #$FS::cust_pkg::DEBUG = 2;
@@ -32,12 +32,12 @@
 
   <!--pkgnum: <% $cust_pkg->pkgnum %>-->
   <TR>
-    <% include('package.html',  %iopt) %>
-    <% include('status.html',   %iopt) %>
+    <& package.html, %iopt &>
+    <& status.html, %iopt &>
 %     if ( $show_location ) {
-    <% include('location.html', %iopt) %>
+    <& location.html, %iopt &>
 %     }
-    <% include('services.html', %iopt) %>
+    <& services.html, %iopt &>
   </TR>
 
 %   } #foreach $cust_pkg
@@ -91,5 +91,4 @@ my %conf_opt = (
   'show_location'             => $show_location,
 );
 
-
 </%init>
diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html
index a5a55521a..50e1c1527 100644
--- a/httemplate/view/cust_main/packages/services.html
+++ b/httemplate/view/cust_main/packages/services.html
@@ -20,7 +20,7 @@ function clearhint_search_cust_svc(obj, str) {
 %       my $href="${p}search/cust_pkg_svc.html?svcpart=".$part_svc->svcpart.
 %          ";pkgnum=".$cust_pkg->pkgnum;
         <A HREF="<% $href %>"><% $part_svc->svc %></A>&nbsp;
-        <A HREF="<% $href %>"><B>(view all <% $cust_pkg->num_svcs %>)</B></A>
+        <A HREF="<% $href %>"><B>(<% mt("view all [_1]", $cust_pkg->num_svcs) |h %>)</B></A>
 %     my $hint = $hints{$part_svc->svcdb};
 %     if ( $hint ) {
         <BR>
@@ -38,20 +38,20 @@ function clearhint_search_cust_svc(obj, str) {
 %    else { # don't summarize
 %      foreach my $cust_svc ( @{ $part_svc->cust_pkg_svc } ) {
 %        if ( $cust_pkg->getfield('cancel') > 0 ) {
-      <% include('/elements/tr-cust_svc_cancel.html',
+      <& /elements/tr-cust_svc_cancel.html,
                   %opt,
                   'part_svc' => $part_svc,
                   'cust_svc' => $cust_svc,
                   'cust_pkg' => $cust_pkg,
-      ) %>
+       &>
 %        }
 %        else {
-      <% include('/elements/tr-cust_svc.html',
+      <& /elements/tr-cust_svc.html,
                   %opt,
                   'part_svc' => $part_svc,
                   'cust_svc' => $cust_svc,
                   'cust_pkg' => $cust_pkg,
-      ) %>
+       &>
 %       } #if cancel > 0
 %     } #foreach $cust_svc
 %   } #if summarizing
@@ -65,7 +65,7 @@ function clearhint_search_cust_svc(obj, str) {
           <B><% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %></B>
 %        if ( $curuser->access_right('Bulk provision customer service') 
 %               && $part_svc->svcdb eq 'svc_phone' ) {
-            <BR><A HREF="<%$p%>browse/did_order.html?custnum=<%$cust_pkg->custnum%>">Browse Received DID Inventory</A> 
+            <BR><A HREF="<%$p%>browse/did_order.html?custnum=<%$cust_pkg->custnum%>"><% mt('Browse Received DID Inventory') |h %></A> 
 %       }
         </TD>
       </TR>