[freeside-commits] freeside/conf invoice_html, 1.39, 1.40 invoice_latex, 1.46, 1.47 invoice_template, 1.4, 1.5
Mark Wells
mark at wavetail.420.am
Thu Sep 15 03:18:55 PDT 2011
- Previous message: [freeside-commits] freeside/FS/FS/part_export shellcommands.pm, 1.58, 1.59
- Next message: [freeside-commits] freeside/httemplate/config config-download.cgi, 1.3, 1.4 config-image.cgi, 1.2, 1.3 config-process.cgi, 1.28, 1.29 config-view.cgi, 1.44, 1.45 config.cgi, 1.37, 1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv16658/conf
Modified Files:
invoice_html invoice_latex invoice_template
Log Message:
invoice template and config localization, #12367
Index: invoice_template
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- invoice_template 7 Oct 2009 23:44:26 -0000 1.4
+++ invoice_template 15 Sep 2011 10:18:53 -0000 1.5
@@ -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; }
Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -w -d -r1.46 -r1.47
--- invoice_latex 16 Aug 2011 00:44:16 -0000 1.46
+++ invoice_latex 15 Sep 2011 10:18:52 -0000 1.47
@@ -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';
Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -w -d -r1.39 -r1.40
--- invoice_html 16 Aug 2011 00:44:16 -0000 1.39
+++ invoice_html 15 Sep 2011 10:18:52 -0000 1.40
@@ -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 date<BR>
+ <%= emt('Invoice date') %><BR>
<B><%= $date %></B>
</td>
<td>
</td>
<td align="center">
- Invoice #<BR>
+ <%= emt('Invoice #') %><BR>
<B><%= $invnum %></B>
</td>
<td>
</td>
<td align="center">
- Customer #<BR>
+ <%= emt('Customer #') %><BR>
<B><%= $custnum %></B>
</td>
</tr>
<tr>
<th> </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> </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'}) {
+ my $sectionhead = $section->{'description'} || emt('Charges');
$OUT .=
- '<p><b><font size="+1">'. uc(substr($section->{'description'},0,1)).
- '</font><font size="+0">'. uc(substr($section->{'description'},1)).
+ '<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>'.
+ $OUT .= '<th align="center">' . emt('Ref') . '</th>'.
+ '<th align="left">' . emt('Description') . '</th>'.
( $unitprices
- ? '<th align="left">Unit Price</th>'.
- '<th align="left">Quantity</th>'
- : ''
- ).
- '<th align="right">Amount</th>';
+ ? '<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>';
}
- Previous message: [freeside-commits] freeside/FS/FS/part_export shellcommands.pm, 1.58, 1.59
- Next message: [freeside-commits] freeside/httemplate/config config-download.cgi, 1.3, 1.4 config-image.cgi, 1.2, 1.3 config-process.cgi, 1.28, 1.29 config-view.cgi, 1.44, 1.45 config.cgi, 1.37, 1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list