[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[3514] trunk



Revision: 3514
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3514&view=rev
Author:   einhverfr
Date:     2011-07-15 00:07:38 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
Localization now works in printed templates

Modified Paths:
--------------
    trunk/LedgerSMB/IR.pm
    trunk/LedgerSMB/Template.pm
    trunk/bin/arapprn.pl
    trunk/templates/demo/ap_transaction.html
    trunk/templates/demo/ar_transaction.html
    trunk/templates/demo/bin_list.html
    trunk/templates/demo/invoice.html

Modified: trunk/LedgerSMB/IR.pm
===================================================================
--- trunk/LedgerSMB/IR.pm	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/LedgerSMB/IR.pm	2011-07-15 00:07:38 UTC (rev 3514)
@@ -1453,13 +1453,30 @@
 
     # get rest for the vendor
     my $query = qq|
-		SELECT vendornumber, name, address1, address2, city, state,
-		       zipcode, country, contact, phone as vendorphone, 
-		       fax as vendorfax, vendornumber, 
-		       taxnumber AS vendortaxnumber, sic_code AS sic, iban, bic,
-		       gifi_accno AS gifi, startdate, enddate
-		  FROM vendor
-		 WHERE id = ?|;
+		SELECT meta_number as vendornumber, e.name, 
+                       line_one as address1, line_two as address2, city, state,
+		       mail_code as zipcode, c.name as country, 
+                       pay_to_name as contact, 
+                       phone as vendorphone, fax as vendorfax, 
+		       tax_id AS vendortaxnumber, sic_code AS sic, iban, bic,
+		       -- gifi_accno AS gifi, 
+                       startdate, enddate
+		  FROM entity_credit_account eca
+                  JOIN entity e ON eca.entity_id = e.id
+                  JOIN company co ON co.entity_id = e.id
+             LEFT JOIN eca_to_location e2l ON eca.id = e2l.credit_id
+             LEFT JOIN location l ON l.id = e2l.location_id
+             LEFT JOIN country c ON l.country_id = c.id
+             LEFT JOIN (select max(phone) as phone, max(fax) as fax, credit_id
+                          FROM (SELECT CASE WHEN contact_class_id =1 THEN contact
+                                       END as phone, 
+                                       CASE WHEN contact_class_id =9 THEN contact
+                                       END as fax,
+                                       credit_id 
+                                  FROM eca_to_contact) ct_base
+                        GROUP BY credit_id) ct ON ct.credit_id = eca.id
+             LEFT JOIN entity_bank_account ba ON ba.id = eca.bank_account
+		 WHERE eca.id = ? and location_class = 1|;
     my $sth = $dbh->prepare($query);
     $sth->execute( $form->{vendor_id} ) || $form->dberror($query);
 

Modified: trunk/LedgerSMB/Template.pm
===================================================================
--- trunk/LedgerSMB/Template.pm	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/LedgerSMB/Template.pm	2011-07-15 00:07:38 UTC (rev 3514)
@@ -133,6 +133,7 @@
 use LedgerSMB::Sysconfig;
 use LedgerSMB::Mailer;
 use LedgerSMB::Company_Config;
+use LedgerSMB::Locale;
 
 sub new {
 	my $class = shift;
@@ -155,6 +156,9 @@
 	$self->{method} ||= $args{media};
 	$self->{format_args} = $args{format_options};
 	$self->{output_args} = $args{output_options};
+        if ($self->{language}){ # Language takes precedence over locale
+             $self->{locale} = LedgerSMB::Locale->get_handle($self->{language});
+        }
 
 	# SC: Muxing pre-format_args LaTeX format specifications.  Now with
 	#     DVI support.

Modified: trunk/bin/arapprn.pl
===================================================================
--- trunk/bin/arapprn.pl	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/bin/arapprn.pl	2011-07-15 00:07:38 UTC (rev 3514)
@@ -289,6 +289,7 @@
 
     my $template = LedgerSMB::Template->new( 
         user => \%myconfig, template => $form->{'formname'}, 
+        locale => $locale,
         format => uc $form->{'format'},
 	no_auto_output => 1,
         output_args => $form,
@@ -561,6 +562,7 @@
 
     my $template = LedgerSMB::Template->new(
         user => \%myconfig, template => $form->{'formname'}, 
+        locale => $locale,
 	no_auto_output => 1,
         format => uc $form->{format} );
     try {

Modified: trunk/templates/demo/ap_transaction.html
===================================================================
--- trunk/templates/demo/ap_transaction.html	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/templates/demo/ap_transaction.html	2011-07-15 00:07:38 UTC (rev 3514)
@@ -9,7 +9,9 @@
     <td width=10>&nbsp;</td>
 
     <th colspan=3>
-      <h4>A P - T R A N S A C T I O N</h4>
+      <h4 style="text-transform:uppercase; letter-spacing:0.5em">
+             <?lsmb text('AP Transaction') ?>
+      </h4>
     </th>
   </tr>
 
@@ -40,11 +42,11 @@
           <?lsmb END ?>
 
           <?lsmb IF vendorphone ?>
-          <br>Tel: <?lsmb vendorphone ?>
+          <br><?lsmb text('Tel: [_1]', vendorphone) ?>
           <?lsmb END ?>
 
           <?lsmb IF vendorfax ?>
-          <br>Fax: <?lsmb vendorfax ?>
+          <br><?lsmb text('Fax: [_1]', vendorfax) ?>
           <?lsmb END ?>
 
           <?lsmb IF email ?>
@@ -52,38 +54,38 @@
           <?lsmb END ?>
 
           <?lsmb IF vendortaxnumber ?>
-          <p>Taxnumber: <?lsmb vendortaxnumber ?>
+          <p><?lsmb text('Taxnumber: [_1]', vendortaxnumber) ?>
           <?lsmb END ?>
           </td>
    
 	  <td align=right>
 	    <table>
 	      <tr>
-		<th align=left nowrap>Invoice #</th>
+		<th align=left nowrap><?lsmb text('Invoice #') ?></th>
 		<td><?lsmb invnumber ?></td>
 	      </tr>
 	      <tr>
-		<th align=left nowrap>Date</th>
+		<th align=left nowrap><?lsmb text('Date') ?></th>
 		<td><?lsmb invdate ?></td>
 	      </tr>
 	      <tr>
-		<th align=left nowrap>Due</th>
+		<th align=left nowrap><?lsmb text('Due') ?></th>
 		<td><?lsmb duedate ?></td>
 	      </tr>
 	      <?lsmb IF ponumber ?>
               <tr>
-                <th align=left>PO #</th>
+                <th align=left><?lsmb text('PO #') ?></th>
 		<td><?lsmb ponumber ?>&nbsp;</td>
 	      </tr>
 	      <?lsmb END ?>
 	      <?lsmb IF ordnumber ?>
 	      <tr>
-		<th align=left>Order #</th>
+		<th align=left><?lsmb text('Order #') ?></th>
 		<td><?lsmb ordnumber ?>&nbsp;</td>
 	      </tr>
 	      <?lsmb END ?>
 	      <tr>
-		<th align=left nowrap>Employee</th>
+		<th align=left nowrap><?lsmb text('Employee') ?></th>
 		<td><?lsmb employee ?>&nbsp;</td>
 	      </tr>
 	    </table>
@@ -116,11 +118,11 @@
 
 	<tr>
 	  <?lsmb IF taxincluded ?>
-	  <th colspan=2 align=right>Total</th>
+	  <th colspan=2 align=right><?lsmb text('Total') ?></th>
 	  <td width=10> </td>
 	  <td align=right><?lsmb invtotal ?></td>
 	  <?lsmb ELSE ?>
-	  <th colspan=2 align=right>Subtotal</th>
+	  <th colspan=2 align=right><?lsmb text('Subtotal') ?></th>
 	  <td width=10> </td>
 	  <td align=right><?lsmb subtotal ?></td>
 	  <?lsmb END ?>
@@ -137,7 +139,7 @@
 	
 	<?lsmb IF NOT taxincluded ?>
 	<tr>
-	  <th colspan=2 align=right>Total</th>
+	  <th colspan=2 align=right><?lsmb text('Total') ?></th>
 	  <td width=10> </td>
 	  <td align=right><?lsmb invtotal ?></td>
 	</tr>
@@ -169,7 +171,7 @@
     <td>
       <table>
         <tr>
-          <th>Payments</th>
+          <th><?lsmb text('Payments') ?></th>
         </tr>
 
         <tr>
@@ -182,11 +184,11 @@
 	  <td>
 	    <table>
 	      <tr>
-		<th>Date</th>
+		<th><?lsmb text('Date') ?></th>
 		<th>&nbsp;</th>
-		<th>Source</th>
-		<th>Memo</th>
-		<th>Amount</th>
+		<th><?lsmb text('Source') ?></th>
+		<th><?lsmb text('Memo') ?></th>
+		<th><?lsmb text('Amount') ?></th>
 	      </tr>
   <?lsmb END ?>
 
@@ -218,7 +220,8 @@
   </tr>
 
   <tr>
-    <th colspan=3 align=left><font size=-2>Taxes shown are included in price.</th>
+    <th colspan=3 align=left><font size=-2>
+          <?lsmb text('Taxes shown are included in price.') ?></th>
   </tr>
   <?lsmb END ?>
 

Modified: trunk/templates/demo/ar_transaction.html
===================================================================
--- trunk/templates/demo/ar_transaction.html	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/templates/demo/ar_transaction.html	2011-07-15 00:07:38 UTC (rev 3514)
@@ -9,7 +9,8 @@
     <td width=10>&nbsp;</td>
 
     <th colspan=3>
-      <h4>A R - T R A N S A C T I O N</h4>
+      <h4 style="text-transform:uppercase; letter-spacing:0.5em">
+          <?lsmb text('AR Transaction') ?></h4>
     </th>
   </tr>
 
@@ -40,11 +41,11 @@
           <?lsmb END ?>
 
           <?lsmb IF customerphone ?>
-          <br>Tel: <?lsmb customerphone ?>
+          <br><?lsmb text('Tel:') _ ' ' _ customerphone ?>
           <?lsmb END ?>
 
           <?lsmb IF customerfax ?>
-          <br>Fax: <?lsmb customerfax ?>
+          <br><?lsmb text('Fax:') _ ' ' _ customerfax ?>
           <?lsmb END ?>
 
           <?lsmb IF email ?>
@@ -52,38 +53,38 @@
           <?lsmb END ?>
 
           <?lsmb IF customertaxnumber ?>
-          <br>Taxnumber: <?lsmb customertaxnumber ?>
+          <br><?lsmb text('Taxnumber:') _ ' ' _ customertaxnumber ?>
           <?lsmb END ?>
           </td>
    
 	  <td align=right>
 	    <table>
 	      <tr>
-		<th align=left nowrap>Invoice #</th>
+		<th align=left nowrap><?lsmb text('Invoice #') ?></th>
 		<td><?lsmb invnumber ?></td>
 	      </tr>
 	      <tr>
-		<th align=left nowrap>Date</th>
+		<th align=left nowrap><?lsmb text('Date') ?></th>
 		<td><?lsmb invdate ?></td>
 	      </tr>
 	      <tr>
-		<th align=left nowrap>Due</th>
+		<th align=left nowrap><?lsmb text('Due') ?></th>
 		<td><?lsmb duedate ?></td>
 	      </tr>
 	      <?lsmb IF ponumber ?>
               <tr>
-                <th align=left>PO #</th>
+                <th align=left><?lsmb text('PO #') ?></th>
 		<td><?lsmb ponumber ?>&nbsp;</td>
 	      </tr>
 	      <?lsmb END ?>
 	      <?lsmb IF ordnumber ?>
 	      <tr>
-		<th align=left>Order #</th>
+		<th align=left><?lsmb text('Order #') ?></th>
 		<td><?lsmb ordnumber ?>&nbsp;</td>
 	      </tr>
 	      <?lsmb END ?>
 	      <tr>
-		<th align=left nowrap>Salesperson</th>
+		<th align=left nowrap><?lsmb text('Salesperson') ?></th>
 		<td><?lsmb employee ?>&nbsp;</td>
 	      </tr>
 	    </table>
@@ -116,11 +117,11 @@
 
 	<tr>
 	  <?lsmb IF taxincluded ?>
-	  <th colspan=2 align=right>Total</th>
+	  <th colspan=2 align=right><?lsmb text('Total') ?></th>
 	  <td width=10>&nbsp;</td>
 	  <td align=right><?lsmb invtotal ?></td>
 	  <?lsmb ELSE ?>
-	  <th colspan=2 align=right>Subtotal</th>
+	  <th colspan=2 align=right><?lsmb text('Subtotal') ?></th>
 	  <td width=10>&nbsp;</td>
 	  <td align=right><?lsmb subtotal ?></td>
 	  <?lsmb END ?>
@@ -137,7 +138,7 @@
 	
 	<?lsmb IF NOT taxincluded ?>
 	<tr>
-	  <th colspan=2 align=right>Total</th>
+	  <th colspan=2 align=right><?lsmb text('Total') ?></th>
 	  <td width=10>&nbsp;</td>
 	  <td align=right><?lsmb invtotal ?></td>
 	</tr>
@@ -169,7 +170,7 @@
     <td>
       <table>
         <tr>
-          <th>Payments</th>
+          <th><?lsmb text('Payments') ?></th>
         </tr>
 
         <tr>
@@ -182,10 +183,10 @@
 	  <td>
 	    <table>
 	      <tr>
-		<th>Date</th>
+		<th><?lsmb text('Date') ?></th>
 		<th>&nbsp;</th>
-		<th>Source</th>
-		<th>Amount</th>
+		<th><?lsmb text('Source') ?></th>
+		<th><?lsmb text('Amount') ?></th>
 	      </tr>
   <?lsmb END ?>
 
@@ -215,7 +216,7 @@
   <tr>
     <td>&nbsp;</td>
 
-    <th colspan=9 align=left><font size=-2><?lsmb taxdescription.${loop_count} ?> Registration <?lsmb taxnumber.${loop_count} ?></th>
+    <th colspan=9 align=left><font size=-2><?lsmb taxdescription.${loop_count} ?> <?lsmb text('Registration') _ ' ' _  taxnumber.${loop_count} ?></th>
   </tr>
   <?lsmb END ?>
 
@@ -225,7 +226,8 @@
   </tr>
 
   <tr>
-    <th colspan=3 align=left><font size=-2>Taxes shown are included in price.</th>
+    <th colspan=3 align=left><font size=-2>
+         <?lsmb text('Taxes shown are included in price.') ?></th>
   </tr>
   <?lsmb END ?>
 

Modified: trunk/templates/demo/bin_list.html
===================================================================
--- trunk/templates/demo/bin_list.html	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/templates/demo/bin_list.html	2011-07-15 00:07:38 UTC (rev 3514)
@@ -9,7 +9,8 @@
     <td width=10>&nbsp;</td>
     
     <th colspan=3>
-      <h4>B I N &nbsp;&nbsp; L I S T</h4>
+      <h4 style="text-transform:uppercase; letter-spacing:0.5em">
+         <?lsmb text('Bin List') ?></h4>
     </th>
   </tr>
 
@@ -19,8 +20,10 @@
     <td>
       <table width=100% cellspacing=0 cellpadding=0>
 	<tr bgcolor=000000>
-	  <th align=left width="50%"><font color=ffffff>From</th>
-	  <th align=left width="50%"><font color=ffffff>Ship To</th>
+	  <th align=left width="50%"><font color=ffffff><?lsmb text('From') ?>
+          </th>
+	  <th align=left width="50%"><font color=ffffff><?lsmb text('Ship To') ?>
+          </th>
 	</tr>
 
 	<tr valign=top>
@@ -40,15 +43,15 @@
 	  <br>
 
 	  <?lsmb IF contact ?>
-	  <br>Attn: <?lsmb contact ?>
+	  <br><?lsmb text('Attn: [_1]', contact) ?>
 	  <?lsmb END ?>
 
 	  <?lsmb IF vendorphone ?>
-	  <br>Tel: <?lsmb vendorphone ?>
+	  <br><?lsmb text('Tel: [_1]', vendorphone) ?>
 	  <?lsmb END ?>
 
 	  <?lsmb IF vendorfax ?>
-	  <br>Fax: <?lsmb vendorfax ?>
+	  <br><?lsmb text('Fax: [_1]', vendorfax) ?>
 	  <?lsmb END ?>
 
 	  <?lsmb IF email ?>
@@ -73,15 +76,15 @@
 
 	  <br>
 	  <?lsmb IF shiptocontact ?>
-	  <br>Attn: <?lsmb shiptocontact ?>
+	  <br><?lsmb text('Attn: [_1]', shiptocontact) ?>
 	  <?lsmb END ?>
 	  
 	  <?lsmb IF shiptophone ?>
-	  <br>Tel: <?lsmb shiptophone ?>
+	  <br><?lsmb text('Tel: [_1]', shiptophone) ?>
 	  <?lsmb END ?>
 
 	  <?lsmb IF shiptofax ?>
-	  <br>Fax: <?lsmb shiptofax ?>
+	  <br><?lsmb text('Fax: [_1]', shiptofax) ?>
 	  <?lsmb END ?>
 	  </td>
 	</tr>
@@ -97,14 +100,14 @@
     <td>
       <table width=100% border=1>
 	<tr>
-	  <th width=17% align=left nowrap>Order #</th>
-	  <th width=17% align=left nowrap>Date</th>
-	  <th width=17% align=left nowrap>Contact</th>
+	  <th width=17% align=left nowrap><?lsmb text('Order #') ?></th>
+	  <th width=17% align=left nowrap><?lsmb text('Date') ?></th>
+	  <th width=17% align=left nowrap><?lsmb text('Contact') ?></th>
 	  <?lsmb IF warehouse ?>
-	  <th width=17% align=left nowrap>Warehouse</th>
+	  <th width=17% align=left nowrap><?lsmb text('Warehouse') ?></th>
 	  <?lsmb END ?>
-	  <th width=17% align=left>Shipping Point</th>
-	  <th width=15% align=left>Ship via</th>
+	  <th width=17% align=left><?lsmb text('Shipping Point') ?></th>
+	  <th width=15% align=left><?lsmb text('Ship via') ?></th>
 	</tr>
 
 	<tr>
@@ -135,15 +138,15 @@
     <td>
       <table width="100%">
 	<tr bgcolor=000000>
-	  <th align=left><font color=ffffff>Item</th>
-	  <th align=left><font color=ffffff>Number</th>
-	  <th align=left><font color=ffffff>Description</th>
-	  <th><font color=ffffff>Serialnumber</th>
+	  <th align=left><font color=ffffff><?lsmb text('Item') ?></th>
+	  <th align=left><font color=ffffff><?lsmb text('Number') ?></th>
+	  <th align=left><font color=ffffff><?lsmb text('Description') ?></th>
+	  <th><font color=ffffff><?lsmb text('Serialnumber') ?></th>
 	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Qty</th>
-	  <th><font color=ffffff>Recd</th>
+	  <th><font color=ffffff><?lsmb text('Qty') ?></th>
+	  <th><font color=ffffff><?lsmb text('Recd') ?></th>
 	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Bin</th>
+	  <th><font color=ffffff><?lsmb text('Bin') ?></th>
 	</tr>
 
 	<?lsmb FOREACH number ?>

Modified: trunk/templates/demo/invoice.html
===================================================================
--- trunk/templates/demo/invoice.html	2011-07-14 21:48:13 UTC (rev 3513)
+++ trunk/templates/demo/invoice.html	2011-07-15 00:07:38 UTC (rev 3514)
@@ -9,7 +9,8 @@
     <td width=10>&nbsp;</td>
 
     <th colspan=3>
-      <h4>I N V O I C E</h4>
+      <h4 style="text-transform:uppercase; letter-spacing:0.5em">
+          <?lsmb text('Invoice') ?></h4>
     </th>
   </tr>
 
@@ -19,8 +20,9 @@
     <td>
       <table width=100% cellspacing=0 cellpadding=0>
         <tr bgcolor=000000>
-          <th align=left width="50%"><font color=ffffff>To</th>
-          <th align=left width="50%"><font color=ffffff>Ship To</th>
+          <th align=left width="50%"><font color=ffffff><?lsmb text('To') ?></th>
+          <th align=left width="50%"><font color=ffffff><?lsmb text('Ship To') ?>
+          </th>
         </tr>
 
         <tr valign=top>
@@ -45,11 +47,11 @@
           <?lsmb END ?>
 
           <?lsmb IF customerphone ?>
-          <br>Tel: <?lsmb customerphone ?>
+          <br><?lsmb text('Tel: [_1]', customerphone) ?>
           <?lsmb END ?>
 
           <?lsmb IF customerfax ?>
-          <br>Fax: <?lsmb customerfax ?>
+          <br><?lsmb text('Fax: [_1]', customerfax) ?>
           <?lsmb END ?>
 
           <?lsmb IF email ?>
@@ -78,11 +80,11 @@
           <?lsmb END ?>
 
           <?lsmb IF shiptophone ?>
-          <br>Tel: <?lsmb shiptophone ?>
+          <br><?lsmb text('Tel: [_1]', shiptophone) ?>
           <?lsmb END ?>
 
           <?lsmb IF shiptofax ?>
-          <br>Fax: <?lsmb shiptofax ?>
+          <br><?lsmb text('Fax: [_1]', shiptofax) ?>
           <?lsmb END ?>
 
           <?lsmb IF shiptoemail ?>
@@ -102,13 +104,13 @@
     <td>
       <table width=100% border=1>
         <tr>
-	  <th width=14% align=left nowrap>Invoice #</th>
-	  <th width=14% align=left nowrap>Date</th>
-	  <th width=14% align=left nowrap>Due</th>
-	  <th width=14% align=left>Order #</th>
-	  <th width=14% align=left nowrap>Salesperson</th>
-	  <th width=14% align=left nowrap>Shipping Point</th>
-	  <th width=14% align=left nowrap>Ship via</th>
+	  <th width=14% align=left nowrap><?lsmb text('Invoice #') ?></th>
+	  <th width=14% align=left nowrap><?lsmb text('Date') ?></th>
+	  <th width=14% align=left nowrap><?lsmb text('Due') ?></th>
+	  <th width=14% align=left><?lsmb text('Order #') ?></th>
+	  <th width=14% align=left nowrap><?lsmb text('Salesperson') ?></th>
+	  <th width=14% align=left nowrap><?lsmb text('Shipping Point') ?></th>
+	  <th width=14% align=left nowrap><?lsmb text('Ship via') ?></th>
 	</tr>
 
 	<tr>
@@ -130,15 +132,15 @@
     <td>
       <table width="100%">
         <tr bgcolor=000000>
-          <th align=right><font color=ffffff>Item</th>
-          <th align=left><font color=ffffff>Number</th>
-          <th align=left><font color=ffffff>Description</th>
+          <th align=right><font color=ffffff><?lsmb text('Item') ?></th>
+          <th align=left><font color=ffffff><?lsmb text('Number') ?></th>
+          <th align=left><font color=ffffff><?lsmb text('Description') ?></th>
           <th>&nbsp;</th>
-          <th align=right><font color=ffffff>Qt'y</th>
+          <th align=right><font color=ffffff><?lsmb text('Qty') ?></th>
           <th>&nbsp;</th>
-          <th align=right><font color=ffffff>Unit Price</th>
-          <th align=right><font color=ffffff>Disc %</th>
-          <th align=right><font color=ffffff>Extended</th>
+          <th align=right><font color=ffffff><?lsmb text('Unit Price') ?></th>
+          <th align=right><font color=ffffff><?lsmb text('Disc %') ?></th>
+          <th align=right><font color=ffffff><?lsmb text('Extended') ?></th>
         </tr>
 
         <?lsmb FOREACH number ?>
@@ -162,10 +164,10 @@
     
         <tr>
           <?lsmb IF taxincluded ?>
-          <th colspan=7 align=right>Total</th>
+          <th colspan=7 align=right><?lsmb text('Total') ?></th>
           <td colspan=2 align=right><?lsmb invtotal ?></td>
           <?lsmb ELSE ?>
-          <th colspan=7 align=right>Subtotal</th>
+          <th colspan=7 align=right><?lsmb text('Subtotal') ?></th>
           <td colspan=2 align=right><?lsmb subtotal ?></td>
           <?lsmb END ?>
         </tr>
@@ -180,7 +182,7 @@
 
         <?lsmb IF paid ?>
         <tr>
-          <th colspan=7 align=right>Paid</th>
+          <th colspan=7 align=right><?lsmb text('Paid') ?></th>
           <td colspan=2 align=right>- <?lsmb paid ?></td>
         </tr>
         <?lsmb END ?>
@@ -193,7 +195,7 @@
         <?lsmb IF total ?>
         <tr>
           <td colspan=5>&nbsp;</td>
-          <th colspan=2 align=right nowrap>Balance Due</th>
+          <th colspan=2 align=right nowrap><?lsmb text('Balance Due') ?></th>
           <th colspan=2 align=right><?lsmb total ?></th>
         </tr>
         <?lsmb END ?>
@@ -216,7 +218,7 @@
 	  <td><?lsmb text_amount ?> ***** <?lsmb decimal ?>/100</td>
 	  
           <td align=right nowrap>
-          All prices in <b><?lsmb currency ?></b>
+          <?lsmb text('All prices in [1]', currency) ?>
           </td>
         </tr>
       </table>
@@ -231,7 +233,7 @@
       <table width="60%">
 
         <tr>
-          <th align=left>Payments</th>
+          <th align=left><?lsmb text('Payments') ?></th>
         </tr>
 
         <tr>
@@ -241,10 +243,10 @@
         </tr>
 
         <tr>
-          <th align=left>Date</th>
-          <th align=left>Account</th>
-          <th align=left>Source</th>
-          <th align=left>Amount</th>
+          <th align=left><?lsmb text('Date') ?></th>
+          <th align=left><?lsmb text('Account') ?></th>
+          <th align=left><?lsmb text('Source') ?></th>
+          <th align=left><?lsmb text('Amount') ?></th>
         </tr>
   <?lsmb END ?>
 
@@ -270,7 +272,7 @@
     <td>&nbsp;</td>
 
     <th>
-    Thank you for your valued business!
+    <?lsmb text('Thank you for your valued business!') ?>
     </th>
   </tr>
 
@@ -281,8 +283,8 @@
       <table width="100%">
         <tr valign=top>
           <td width="60%"><font size=-3>
-          Payment due by <?lsmb duedate ?>.
-          Items returned are subject to a 10% restocking charge. A return authorization must be obtained from <?lsmb company ?> before goods are returned. Returns must be shipped prepaid and properly insured. <?lsmb company ?> will not be responsible for damages during transit.
+          <?lsmb text('Payment due by [_1].', duedate) ?>
+          <?lsmb text('Items returned are subject to a 10% restocking charge. A return authorization must be obtained from [_1] before goods are returned. Returns must be shipped prepaid and properly insured. [_1] will not be responsible for damages during transit.', company) ?>
           </font>
           </td>
 
@@ -299,7 +301,7 @@
   <tr>
     <td>&nbsp;</td>
 
-    <th colspan=9 align=left><font size=-2><?lsmb taxdescription.${loop_count} ?> Registration <?lsmb taxnumber.${loop_count} ?></th>
+    <th colspan=9 align=left><font size=-2><?lsmb taxdescription.${loop_count} ?> <?lsmb text('Registration [_1]', taxnumber.${loop_count}) ?></th>
   </tr>
   <?lsmb END ?>
 
@@ -309,7 +311,8 @@
   </tr>
 
   <tr>
-    <th colspan=8 align=left><font size=-2>Taxes shown are included in price.</th>
+    <th colspan=8 align=left><font size=-2>
+       <?lsmb text('Taxes shown are included in price.') ?></th>
   </tr>
   <?lsmb END ?>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.