invoice template and config localization, #12367

3 files changed, 40 insertions, 44 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index 289ada1da..1d53683ad 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -11,6 +11,7 @@
 .invoice_desc_more TD { font-weight: bold; font-size: 10pt }
 .invoice_extdesc TD { font-size: 8pt }
 .invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
+.allcaps { text-transform:uppercase }
 </STYLE>
 
 <table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
@@ -23,26 +24,26 @@
         <table CLASS="invoice_headerright" cellspacing=0>
           <tr>
             <td align="center">
-              Invoice&nbsp;date<BR>
+              <%= emt('Invoice date') %><BR>
               <B><%= $date %></B>
             </td>
             <td>
             </td>
             <td align="center">
-              Invoice&nbsp;#<BR>
+              <%= emt('Invoice #') %><BR>
               <B><%= $invnum %></B>
             </td>
             <td>
             </td>
             <td align="center">
-              Customer&nbsp;#<BR>
+              <%= emt('Customer #') %><BR>
               <B><%= $custnum %></B>
             </td>
           </tr>
           <tr>
             <th>&nbsp;</th>
-            <th colspan=3 align="center">
-              <FONT SIZE="+3"><%= $notice_name ? substr($notice_name, 0, 1) : 'I' %></FONT><FONT SIZE="+2"><%= $notice_name ? uc(substr($notice_name, 1)) : 'NVOICE' %></FONT>
+            <th colspan=3 align="center" class="allcaps">
+	      <FONT SIZE="+3"><%= substr(emt($notice_name),0,1) %></FONT><FONT SIZE="+2"><%= substr(emt($notice_name),1) %></FONT>
             </th>
             <th>&nbsp;</th>
           </tr>
@@ -64,7 +65,7 @@
         %>
       </td>
       <%= $ship_enable ? ('<td align="left">'.
-                          join('<BR>',grep length($_), '<b>Service Address</b>',
+                          join('<BR>',grep length($_), '<b>'.emt('Service Address').'</b>',
                                                        $ship_company,
                                                        $ship_address1,
                                                        $ship_address2,
@@ -86,7 +87,7 @@
 	    $OUT .= qq! <img src="cust_bill-barcode.cgi?invnum=$invnum;template=$template"><br> !;
 	}
     %>
-        <%= $terms ? "Terms: $terms" : '' %><BR>
+        <%= $terms ? emt('Terms') . ": $terms" : '' %><BR>
         <%= $po_line %>
       </td>
     </tr>
@@ -111,18 +112,13 @@
         unless ($section->{'summarized'}) {
           $OUT .= '</table>' if ( $notfirst || $section->{'pretotal'} && !$summary );
           $OUT .= '<table><tr><td>';
-          if ($section->{'description'}) {
-            $OUT .=
-              '<p><b><font size="+1">'. uc(substr($section->{'description'},0,1)).
-              '</font><font size="+0">'. uc(substr($section->{'description'},1)).
+          my $sectionhead = $section->{'description'} || emt('Charges');
+          $OUT .=
+              '<p class="allcaps"><b><font size="+1">'. substr($sectionhead,0,1).
+              '</font><font size="+0">'. substr($sectionhead,1).
               '</font></b>'.
-              '<p>';
-          }else{
-            $OUT .=
-              '<p><b><font size="+1">C</font><font size="+0">HARGES</font></b>'.
-              '<p>';
-          }
-          $OUT .= '</td></tr></table>';
+              '<p>'.
+              '</td></tr></table>';
 
           $OUT .=
             '<table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">'.
@@ -133,14 +129,13 @@
             $OUT .= $header;
             $columncount = scalar(my @array = split /<\/th><th/i, $header);
           } else {
-            $OUT .=  '<th align="center">Ref</th>'.
-                     '<th align="left">Description</th>'.
-                        ( $unitprices 
-                          ? '<th align="left">Unit Price</th>'.
-                            '<th align="left">Quantity</th>'
-                          : ''
-                        ). 
-                      '<th align="right">Amount</th>';
+            $OUT .=  '<th align="center">' . emt('Ref') . '</th>'.
+                     '<th align="left">' . emt('Description') . '</th>'.
+                     ( $unitprices 
+                       ? '<th align="left">' . emt('Unit Price') . '</th>'.
+                         '<th align="left">' . emt('Quantity') . '</th>'
+                        : '' ).
+                     '<th align="right">' . emt('Amount') . '</th>';
           }
             $OUT .= '</tr>';
 
@@ -207,7 +202,7 @@
             } else {
               $OUT .= qq(<td align="left" style="$style"). 
                       ( $unitprices ? ' colspan=3>' : '>' ).
-                      $section->{'description'}. ' Total </td>'.
+                      $section->{'description'}. ' ' . emt('Total') . '</td>'.
                       qq(<td align="right" style="$style">).
                       $section->{'subtotal'}. '</td>';
             }
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 10f30cfe8..37f59d2ee 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -21,6 +21,8 @@
 

 \usepackage{fancyhdr,lastpage,ifthen,array,fslongtable,afterpage,caption,multirow,bigstrut}

 \usepackage{graphicx}			% required for logo graphic

+\usepackage[utf8]{inputenc}             % multilanguage support

+\usepackage[T1]{fontenc}

 

 \addtolength{\voffset}{-0.0cm}		% top margin to top of header

 \addtolength{\hoffset}{-0.6cm}		% left margin on page

@@ -125,10 +127,10 @@
   \ifthenelse{\equal{\thepage}{1}}

   { % First page

     \begin{tabular}{ccc}

-    Invoice date & Invoice \#& Customer \#\\

+    [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\

     \vspace{0.2cm}

     \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline

-    \rule{0pt}{5ex} &~~ \huge{\textsc{[@-- $notice_name || 'Invoice' --@]}} & \\

+    \rule{0pt}{5ex} &~~ \huge{\textsc{[@-- emt($notice_name) --@]}} & \\

     \vspace{-0.2cm}

      & & \\\hline

     \end{tabular}

@@ -136,7 +138,7 @@
   { % ... pages

     \small{

       \begin{tabular}{lll}

-      Invoice date & Invoice \#& Customer\#\\

+      [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\

       \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]}\\

       \end{tabular}

     }

@@ -161,19 +163,18 @@
 

 \newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }

 \newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }

-\newcommand{\FSunitcolumns}{ [@-- $unitprices ? '\makebox[2.5cm][l]{\textbf{~~Unit Price}}&\makebox[1.4cm]{\textbf{~Quantity}}&' : '' --@] }

+\newcommand{\FSunitcolumns}{ [@-- 

+  $unitprices 

+  ? '\makebox[2.5cm][l]{\textbf{~~'.emt('Unit Price').'}}&\makebox[1.4cm]{\textbf{~'.emt('Quantity').'}}&' 

+  : '' --@] }

 

 \newcommand{\FShead}{

   \hline

   \rule{0pt}{2.5ex}

   \makebox[1.4cm]{\textbf{Ref}} &

-%  \makebox[2.9cm][l]{\textbf{Description}}&

-%  \makebox[1.4cm][l]{}&

-%  \makebox[1.4cm][l]{}&

-%  \makebox[2.5cm][l]{}&

-  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{Description}}}&

+  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}&

   \FSunitcolumns

-  \makebox[1.6cm][r]{\textbf{Amount}} \\

+  \makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\

   \hline

 }

 

@@ -217,7 +218,7 @@
 \begin{minipage}[t]{6.4cm}

 [@--

   if ($ship_enable) {

-    $OUT .= '\textbf{Service Address}\\\\';

+    $OUT .= '\textbf{' . emt('Service Address') . '}\\\\';

     $OUT .= "\\addressline{$ship_company}";

     $OUT .= "\\addressline{$ship_address1}";

     $OUT .= "\\addressline{$ship_address2}";

@@ -229,7 +230,7 @@
   }

 --@]

 \begin{flushright}

-[@-- $terms ? "Terms: $terms" : '' --@]\\

+[@-- $terms ? emt('Terms') .": $terms" : '' --@]\\

 [@-- $po_line --@]\\

 \end{flushright}

 \end{minipage}}

@@ -252,7 +253,7 @@
         if $coupon;

       $OUT .= '\begin{longtable}{cllllllr}';

       $OUT .= '\caption*{ ';

-      $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';

+      $OUT .= ($section->{'description'}) ? $section->{'description'}: emt('Charges');

       $OUT .= '}\\\\';

       if ($section->{header_generator}) {

         $OUT .= &{$section->{header_generator}}();

@@ -260,14 +261,14 @@
         $OUT .= '\FShead';

       }

       $OUT .= '\endfirsthead';

-      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';

+      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}'.emt('Continued from previous page').'}\\\\';

       if ($section->{header_generator}) {

         $OUT .= &{$section->{header_generator}}();

       } else {

         $OUT .= '\FShead';

       }

       $OUT .= '\endhead';

-      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';

+      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}'.emt('Continued on next page...').'}\\\\';

       $OUT .= '\endfoot';

       $OUT .= '\hline';

 

diff --git a/conf/invoice_template b/conf/invoice_template
index ebf8ef7d0..769f043d7 100644
--- a/conf/invoice_template
+++ b/conf/invoice_template
@@ -1,6 +1,6 @@
 
-                                 { $notice_name || 'Invoice'; }
-                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  Invoice #{ $invnum; }
+                                 { emt($notice_name) }
+                                 { substr(emt("Page [_1] of [_2]          ", $page, $total_pages), 0, 19); } { use Date::Format; time2str("%x", $date); }  { emt("Invoice #") . $invnum; }
 
 
 { $company_name; }