internationalization/localization, RT12515

[freeside.git] / httemplate / view / cust_main / packages / section.html

diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html
index 0795d4e..4ac2e77 100755 (executable)
--- 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
@@ -68,7 +68,7 @@ my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
 
 my %conf_opt = (
   #for services.html and status.html
-  'cust_pkg-display_times'    => $conf->exists('cust_pkg-display_times')
+  'cust_pkg-display_times'    => ($conf->exists('cust_pkg-display_times')
                                  || $curuser->option('cust_pkg-display_times')),
   #for status.html
   'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'),
@@ -91,5 +91,4 @@ my %conf_opt = (
   'show_location'             => $show_location,
 );
 
-
 </%init>