[interchange-cvs] interchange - ton modified 8 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Wed Mar 19 12:16:00 2003


User:      ton
Date:      2003-03-19 17:09:04 GMT
Modified:  dist/foundation/include/checkout billing_address login_form
Modified:           mailing_status new_browser_payment
Modified:           old_browser_payment payment_select shipping_address
Modified:           shopping_cart
Log:
	Prepared pages for translation.

Revision  Changes    Path
1.2       +9 -9      interchange/dist/foundation/include/checkout/billing_address


rev 1.2, prev_rev 1.1
Index: billing_address
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/billing_address,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- billing_address	14 Aug 2002 14:15:31 -0000	1.1
+++ billing_address	19 Mar 2003 17:09:04 -0000	1.2
@@ -4,24 +4,24 @@
 	  <table border=0 cellspacing=0 cellpadding=0 width="100%">
 		<tr class=contentbar2>
 		  <td colspan=4 class=contentbar2>
-		  	<b>&nbsp;Billing Address</b> - <i>If different than above</i>
+		  	<b>&nbsp;[L]Billing Address[/L]</b> - <i>[L]If different than above[/L]</i>
 		  </td>
 		</tr>
 		<tr>
 		  <td align=right class=contentbar1>
-			<b>First Name</b>
+			<b>[L]First Name[/L]</b>
 		  </td>
 		  <td align=left class=contentbar1>
 			<INPUT TYPE=text NAME=b_fname VALUE="[value b_fname]" size="20" maxlength="20">
 		  </td>
-		  <td class=contentbar1><b>Last Name</b></td>
+		  <td align=right class=contentbar1><b>[L]Last Name[/L]</b> </td>
 		  <td align=left class=contentbar1>
 			<INPUT TYPE=text NAME=b_lname VALUE="[value b_lname]" size="20">
 		  </td>
 		</tr>
 		<tr>
 		  <td align=right class=contentbar1>
-			<b>Company</b>
+			<b>[L]Company[/L]</b>
 		  </td>
 		  <td align=left class=contentbar1 colspan=3>
 			<INPUT TYPE=text NAME=b_company VALUE="[value b_company]" size="20" maxlength="44">
@@ -29,7 +29,7 @@
 		</tr>
 		<tr>
 		  <td align=right class=contentbar1>
-			<b>Address</b>
+			<b>[L]Address[/L]</b>
 		  </td>
 		  <td align=left colspan=3 class=contentbar1>
 			<INPUT TYPE=text NAME=b_address1 VALUE="[value b_address1]" size=40 maxlength="64">
@@ -43,19 +43,19 @@
 		</tr>
 		<tr>
 		  <td align=right class=contentbar1>
-			<b>City</b>
+			<b>[L]City[/L]</b>
 		  </td>
 		  <td class=contentbar1>
 			<INPUT TYPE=text NAME=b_city VALUE="[value b_city]" size="20">
 		  </td>
-		  <td align=right class=contentbar1><b>State/Province</b></td>
+		  <td align=right class=contentbar1><b>[L]State/Province[/L]</b></td>
 		  <td class=contentbar1>
 			<INPUT TYPE=text NAME=b_state VALUE="[value b_state]" size="5" maxlength="5">
 		  </td>
 		</tr>
 		<tr>
 		  <td align=right class=contentbar1>
-			<b>Zip/Postal Code </b>
+			<b>[L]Zip/Postal Code[/L]</b>
 		  </td>
 		  <td class=contentbar1 colspan=3>
 			<INPUT TYPE=text NAME=b_zip VALUE="[value b_zip]" size="10" maxlength="10">
@@ -63,7 +63,7 @@
 		</tr>
 		<tr>
 		  <td align=right class=contentbar1>
-			<b>Country</b>
+			<b>[L]Country[/L]</b>
 		  </td>
 		  <td class=contentbar1 colspan=3>
 			<INPUT TYPE=text NAME=b_country VALUE="[value b_country]" size="10" maxlength="10">



1.2       +6 -8      interchange/dist/foundation/include/checkout/login_form


rev 1.2, prev_rev 1.1
Index: login_form
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/login_form,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- login_form	14 Aug 2002 14:15:31 -0000	1.1
+++ login_form	19 Mar 2003 17:09:04 -0000	1.2
@@ -1,8 +1,6 @@
     <br>
-    <p>If you have an account with us, please login using the fields below. It
-    is not required, but you can also <a href="[area new_account]">create an
-    account</a> with us.</p>
-                                  
+    <p>[msg arg.0="<a href='[area new_account]'>" arg.1="</a>"]If you have an account with us, please login using the fields below. It is not required, but you can also %screate an account%s with us.[/msg]</p>
+
     [if session failure]
       <P>
       <b>[calc]delete $Session->{failure}[/calc]</b>
@@ -24,7 +22,7 @@
         <table>
         <tr>
           <td align="right" class="contentbar1">
-            Username:
+            [L]Username[/L]:
           </td>
           <td align="left" class="contentbar1">
             <INPUT NAME=mv_username VALUE="[read-cookie MV_USERNAME]">
@@ -32,7 +30,7 @@
         </tr>
         <tr>
           <td align="right" class="contentbar1">
-            Password:
+            [L]Password[/L]:
           </td>
           <td class="contentbar1" align="left">
             <INPUT TYPE=password NAME=mv_password VALUE="">
@@ -42,7 +40,7 @@
         <tr>
           <td>&nbsp;</td>
           <td>
-            <input type="submit" value="Log In">
+            <input type="submit" value="[L]Log In[/L]">
           </td>
         </tr>
                 [if config CookieLogin]
@@ -50,7 +48,7 @@
           <td align="right">
             <INPUT TYPE=hidden NAME=mv_cookie_password VALUE=0><INPUT TYPE=checkbox NAME=mv_cookie_password VALUE=1>
           </td>
-          <td>Log me in automatically (sets cookie)</td>
+          <td>[L]Log me in automatically (sets cookie)[/L]</td>
         </tr>
                 [/if]
         </table>



1.2       +5 -5      interchange/dist/foundation/include/checkout/mailing_status


rev 1.2, prev_rev 1.1
Index: mailing_status
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/mailing_status,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailing_status	14 Aug 2002 14:15:31 -0000	1.1
+++ mailing_status	19 Mar 2003 17:09:04 -0000	1.2
@@ -4,16 +4,16 @@
 	<td>
 	  <table border="0" align="center" cellspacing="0" width="100%">
 		<tr class="contentbar2">
-		  <td class="contentbar2" colspan=4><b>Mailing Status</b></td>
+		  <td class="contentbar2" colspan=4><b>[L]Mailing Status[/L]</b></td>
 		</tr>
 		<tr>
 		  <td align="center" valign="middle" class="contentbar1">
 			<SELECT NAME=email_copy>
-			<OPTION VALUE="1">Yes
-			<OPTION [selected name=email_copy value=0] VALUE="0">No
+			<OPTION VALUE="1">[L]Yes[/L]
+			<OPTION [selected name=email_copy value=0] VALUE="0">[L]No[/L]
 			</SELECT>
 		  </td>
-		  <td class="contentbar1"><B>Send an email copy of my receipt</B></td>
+		  <td class="contentbar1"><B>[L]Send an email copy of my receipt[/L]</B></td>
 		  <td class="contentbar1">&nbsp;</td>
 		  <td class="contentbar1">&nbsp;</td>
 		</tr>
@@ -27,7 +27,7 @@
 			[input-filter name=mail_list op=null_to_space][/input-filter]
 			[display table=userdb type=multiple column=mail_list key="[data session username]"]
 		  </td>
-		  <td class="contentbar1"><B>Mail lists (if any)</B></td>
+		  <td class="contentbar1"><B>[L]Mail lists (if any)[/L]</B></td>
 		  <td class="contentbar1">&nbsp;</td>
 		  <td class="contentbar1">&nbsp;</td>
 		</tr>



1.3       +26 -26    interchange/dist/foundation/include/checkout/new_browser_payment


rev 1.3, prev_rev 1.2
Index: new_browser_payment
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/new_browser_payment,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- new_browser_payment	10 Oct 2002 13:49:31 -0000	1.2
+++ new_browser_payment	19 Mar 2003 17:09:04 -0000	1.3
@@ -24,7 +24,7 @@
           <tr>
             <td colspan="2" class="contentbar2" width="30%">
               <b>
-              [error std_label="Credit Card Information" name=mv_credit_card_valid]
+              [error std_label="[L]Credit Card Information[/L]" name=mv_credit_card_valid]
               </b>
             </td>
             <td class="contentbar2">
@@ -46,7 +46,7 @@
           </tr>
           <tr>
             <td align=right class="contentbar1" width="30%">
-              <b>Card Number: </b>
+              <b>[L]Card Number[/L]: </b>
             </td>
             <td colspan=2 class="contentbar1">
               <b><INPUT TYPE=text NAME=mv_credit_card_number SIZE=22></b>
@@ -57,13 +57,13 @@
 		  	<td class=contentbar1>
 			</td>
 		  	<td colspan=2 class=contentbar1>
-              (test number <A HREF="javascript:void 0" onclick="checkout.mv_credit_card_number.value='4111 1111 1111 1111'; return false;">4111 1111 1111 1111</A>)
+              ([L]test number[/L] <A HREF="javascript:void 0" onclick="checkout.mv_credit_card_number.value='4111 1111 1111 1111'; return false;">4111 1111 1111 1111</A>)
 			</td>
 		  </tr>
 		  [/if]
           <tr>
             <td align=right class="contentbar1">
-              <b>Expiration: </b>
+              <b>[L]Expiration[/L]: </b>
             </td>
             <td colspan=2 class="contentbar1">
 
@@ -72,18 +72,18 @@
                         option=mv_credit_card_exp_month
 						acclist=1
                         list=|
-1=01 - January,
-2=02 - February,
-3=03 - March,
-4=04 - April,
-5=05 - May,
-6=06 - June,
-7=07 - July,
-8=08 - August,
-9=09 - September,
-10=10 - October,
-11=11 - November,
-12=12 - December|]
+1=01 - [L]January[/L],
+2=02 - [L]February[/L],
+3=03 - [L]March[/L],
+4=04 - [L]April[/L],
+5=05 - [L]May[/L],
+6=06 - [L]June[/L],
+7=07 - [L]July[/L],
+8=08 - [L]August[/L],
+9=09 - [L]September[/L],
+10=10 - [L]October[/L],
+11=11 - [L]November[/L],
+12=12 - [L]December[/L]|]
                 <OPTION VALUE="[loop-code]"> [loop-param label]
                 [/loop]
                 </SELECT>
@@ -123,7 +123,7 @@
 				Visibility:Hidden;
 				z-index:0;
 		">
-		We will wait for a check sent to us referencing the order number you receive on your receipt.
+		[L NEW_BROWSER_PAYMENT_MSG1]We will wait for a check sent to us referencing the order number you receive on your receipt.[/L]
         </div>
 	<div 
 		id=cod
@@ -133,7 +133,7 @@
 				Visibility:Hidden;
 				z-index:0;
 		">
-		There will be a [handling cod] charge added for COD.
+		[msg arg.0="[handling cod]"]There will be a %s charge added for COD.[/msg]
         </div>
         
 	<div 
@@ -150,14 +150,14 @@
             <table border="0" cellspacing="0" cellpadding="0"  width="100%">
             <tr>
               <td class="contentbar2" colspan="2" width="30%">
-                <b>&nbsp;&nbsp;Check Information</b>
+                <b>&nbsp;&nbsp;[L]Check Information[/L]</b>
               </td>
               <td class="contentbar2">&nbsp;</td>
               <td class="contentbar2">&nbsp;</td>
             </tr>
             <tr>
               <td align="right" class="contentbar1">
-                [error name=check_acct std_label="Account Number" required=1]
+                [error name=check_acct std_label="[L]Account Number[/L]" required=1]
               </td>
               <td colspan="3 align="left" class="contentbar1">
                 <b>
@@ -167,7 +167,7 @@
             </tr>
             <tr>
               <td align="right" class="contentbar1">
-                [error name=check_route std_label="Routing Number" required=1]
+                [error name=check_route std_label="[L]Routing Number[/L]" required=1]
                 
               </td>
               <td align="left" colspan="3" class="contentbar1">
@@ -176,7 +176,7 @@
             </tr>
             <tr>
               <td align="right" class="contentbar1">
-                [error name=check_num std_label="Check Number" required=1]
+                [error name=check_num std_label="[L]Check Number[/L]" required=1]
               </td>
               <td align="left" colspan="3" class="contentbar1">
                 <b>
@@ -186,7 +186,7 @@
                 </tr>
             <tr>
               <td align="right" class="contentbar1">
-                [error name=check_bank_phone std_label="Bank Phone" required=1]
+                [error name=check_bank_phone std_label="[L]Bank Phone[/L]" required=1]
                 
               </td>
               <td align="left" colspan="3" class="contentbar1">
@@ -218,13 +218,13 @@
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
             <tr class="contentbar2">
               <td class="contentbar2" colspan="2">
-                <b> P.O. Information </b>
+                <b> [L]P.O. Information[/L] </b>
               </td>
               <td colspan=2 class="contentbar2">&nbsp;</td>
             </tr>
             <tr>
               <td align=right class="contentbar1" width="30%">
-                [error name=credit_limit_ok std_label="PO Number" required=1] &nbsp; &nbsp;
+                [error name=credit_limit_ok std_label="[L]PO Number[/L]" required=1] &nbsp; &nbsp;
               </td>
               <td align=left colspan=3 class="contentbar1">
                 <b>
@@ -256,7 +256,7 @@
                         compare="[total-cost noformat=1]"
                 ]
                 <BR>
-                Order total [total-cost] exceeds credit limit, please call.
+                [msg arg.0="[total-cost]"]Order total %s exceeds credit limit, please call.[/L]
                 [/if]
                 <BR>
               </td>



1.2       +28 -29    interchange/dist/foundation/include/checkout/old_browser_payment


rev 1.2, prev_rev 1.1
Index: old_browser_payment
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/old_browser_payment,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- old_browser_payment	14 Aug 2002 14:15:31 -0000	1.1
+++ old_browser_payment	19 Mar 2003 17:09:04 -0000	1.2
@@ -8,7 +8,7 @@
 	<tr>
 	  <td colspan="2" class="contentbar2" width="30%">
 		<b>
-		[error std_label="Credit Card Information" name=mv_credit_card_valid]
+		[error std_label="[L]Credit Card Information[/L]" name=mv_credit_card_valid]
 		</b>
 	  </td>
 	  <td class="contentbar2">
@@ -30,7 +30,7 @@
 	</tr>
 	<tr>
 	  <td align=right class="contentbar1" width="30%">
-		<b>Card Number: </b>
+		<b>[L]Card Number[/L]: </b>
 	  </td>
 	  <td colspan=2 class="contentbar1">
 		<b><INPUT TYPE=text NAME=mv_credit_card_number SIZE=22></b>
@@ -42,13 +42,13 @@
 	  &nbsp;
 	  </td>
 	  <td colspan=2 class=contentbar1>
-		(test number <A HREF="javascript:void 0" onclick="checkout.mv_credit_card_number.value='4111 1111 1111 1111'; return false;">4111 1111 1111 1111</A>)
+		([L]test number[/L] <A HREF="javascript:void 0" onclick="checkout.mv_credit_card_number.value='4111 1111 1111 1111'; return false;">4111 1111 1111 1111</A>)
 	  </td>
 	</tr>
 	[/if]
 	<tr>
 	  <td align=right class="contentbar1">
-		<b>Expiration: </b>
+		<b>[L]Expiration[/L]: </b>
 	  </td>
 	  <td colspan=2 class="contentbar1">
 
@@ -57,18 +57,18 @@
 				  option=mv_credit_card_exp_month
 				  acclist=1
 				  list=|
-1=01 - January,
-2=02 - February,
-3=03 - March,
-4=04 - April,
-5=05 - May,
-6=06 - June,
-7=07 - July,
-8=08 - August,
-9=09 - September,
-10=10 - October,
-11=11 - November,
-12=12 - December|]
+1=01 - [L]January[/L],
+2=02 - [L]February[/L],
+3=03 - [L]March[/L],
+4=04 - [L]April[/L],
+5=05 - [L]May[/L],
+6=06 - [L]June[/L],
+7=07 - [L]July[/L],
+8=08 - [L]August[/L],
+9=09 - [L]September[/L],
+10=10 - [L]October[/L],
+11=11 - [L]November[/L],
+12=12 - [L]December[/L]|]
 		  <OPTION VALUE="[loop-code]"> [loop-param label]
 		  [/loop]
 		  </SELECT>
@@ -102,11 +102,10 @@
 
 [/then]
 [elsif value mv_order_profile eq postal]
-	  We will wait for a check sent to us referencing the order
-	  number you receive on your receipt.
+	  [L]We will wait for a check sent to us referencing the order number you receive on your receipt.[/L]
 [/elsif]
 [elsif value mv_order_profile eq cod]
-	  There will be a [handling cod] charge added for COD.
+	  [msg arg.0="[handling cod]"]There will be a %s charge added for COD.[/msg]
 [/elsif]
 [elsif value mv_order_profile eq online_check]
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
@@ -115,14 +114,14 @@
 		<table border="0" cellspacing="0" cellpadding="0"  width="100%">
 		<tr>
 		  <td class="contentbar2" colspan="2" width="30%">
-			<b>&nbsp;&nbsp;Check Information</b>
+			<b>&nbsp;&nbsp;[L]Check Information[/L]</b>
 		  </td>
 		  <td class="contentbar2">&nbsp;</td>
 		  <td class="contentbar2">&nbsp;</td>
 		</tr>
 		<tr>
 		  <td align="right" class="contentbar1">
-			[error name=check_acct std_label="Account Number" required=1]
+			[error name=check_acct std_label="[L]Account Number[/L]" required=1]
 		  </td>
 		  <td colspan="3 align="left" class="contentbar1">
 			<b>
@@ -132,7 +131,7 @@
 		</tr>
 		<tr>
 		  <td align="right" class="contentbar1">
-			[error name=check_route std_label="Routing Number" required=1]
+			[error name=check_route std_label="[L]Routing Number[/L]" required=1]
 			
 		  </td>
 		  <td align="left" colspan="3" class="contentbar1">
@@ -141,7 +140,7 @@
 		</tr>
 		<tr>
 		  <td align="right" class="contentbar1">
-			[error name=check_num std_label="Check Number" required=1]
+			[error name=check_num std_label="[L]Check Number[/L]" required=1]
 		  </td>
 		  <td align="left" colspan="3" class="contentbar1">
 			<b>
@@ -151,7 +150,7 @@
 			</tr>
 		<tr>
 		  <td align="right" class="contentbar1">
-			[error name=check_bank_phone std_label="Bank Phone" required=1]
+			[error name=check_bank_phone std_label="[L]Bank Phone[/L]" required=1]
 			
 		  </td>
 		  <td align="left" colspan="3" class="contentbar1">
@@ -177,13 +176,13 @@
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 	<tr class="contentbar2">
 	  <td class="contentbar2" colspan="2">
-		<b> P.O. Information </b>
+		<b> [L]P.O. Information[/L] </b>
 	  </td>
 	  <td colspan=2 class="contentbar2">&nbsp;</td>
 	</tr>
 	<tr>
 	  <td align=right class="contentbar1" width="30%">
-		[error name=credit_limit_ok std_label="PO Number" required=1] &nbsp; &nbsp;
+		[error name=credit_limit_ok std_label="[L]PO Number[/L]" required=1] &nbsp; &nbsp;
 	  </td>
 	  <td align=left colspan=3 class="contentbar1">
 		<b>
@@ -202,7 +201,7 @@
 
 	<tr>
 	  <td align=right valign=top class=contentbar1>
-		<b> Available credit </b>&nbsp;&nbsp;&nbsp;
+		<b> [L]Available credit[/L] </b>&nbsp;&nbsp;&nbsp;
 	  </td>
 	  <td align=left colspan=3 class=contentbar1>
 		[currency]
@@ -215,7 +214,7 @@
 				compare="[total-cost noformat=1]"
 		]
 		<BR>
-		Order total [total-cost] exceeds credit limit, please call.
+		[msg arg.0="[total-cost]"]Order total %s exceeds credit limit, please call.[/msg]
 		[/if]
 		<BR>
 	  </td>
@@ -233,6 +232,6 @@
 
 [/elsif]
 [else]
-	No payment method selected.
+	[L]No payment method selected.[/L]
 [/else]
 [/if]



1.2       +7 -7      interchange/dist/foundation/include/checkout/payment_select


rev 1.2, prev_rev 1.1
Index: payment_select
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/payment_select,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- payment_select	14 Aug 2002 14:15:31 -0000	1.1
+++ payment_select	19 Mar 2003 17:09:04 -0000	1.2
@@ -3,7 +3,7 @@
     <td>
        <table border="0" cellspacing="0" cellpadding="0" width="100%">
           <tr class="contentbar2">
-            <td colspan=4 class="contentbar2"><b>Payment Method</b></td>
+            <td colspan=4 class="contentbar2"><b>[L]Payment Method[/L]</b></td>
           </tr>
           <tr>
             <td colspan=4 class="contentbar1">&nbsp;</td>
@@ -59,25 +59,25 @@
 							[/else]
 							[/if]">
               [if variable CREDIT_CARDS_ACCEPTED]
-              <option [selected mv_order_profile credit_card] value="credit_card">Credit Card
+              <option [selected mv_order_profile credit_card] value="credit_card">[L]Credit Card[/L]
               [/if]
               [if variable CHECK_ACCEPTED]
-              <option [selected mv_order_profile online_check] value="online_check">Online Check
+              <option [selected mv_order_profile online_check] value="online_check">[L]Online Check[/L]
               [/if]
               [if variable PO_ACCEPTED]
-              <option [selected mv_order_profile purchase_order] value="purchase_order">Company P.O.
+              <option [selected mv_order_profile purchase_order] value="purchase_order">[L]Company P.O.[/L]
               [/if]
               [if variable POSTAL_ACCEPTED]
-              <option [selected mv_order_profile postal] value="postal">Postal Billing
+              <option [selected mv_order_profile postal] value="postal">[L]Postal Billing[/L]
               [/if]
               [if variable COD_ACCEPTED]
-              <option [selected mv_order_profile cod] value="cod">C.O.D.
+              <option [selected mv_order_profile cod] value="cod">[L]C.O.D.[/L]
               [/if]
               </SELECT>
             </td>
             <td colspan="2" class="contentbar1"> 
 			  [if scratch old_browser]
-              (will update display)
+              ([L]will update display[/L])
 			  [/if]
             </td>                              
           </tr>



1.3       +19 -19    interchange/dist/foundation/include/checkout/shipping_address


rev 1.3, prev_rev 1.2
Index: shipping_address
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/shipping_address,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shipping_address	21 Nov 2002 22:23:51 -0000	1.2
+++ shipping_address	19 Mar 2003 17:09:04 -0000	1.3
@@ -7,7 +7,7 @@
 		</tr>
 		<tr class="contentbar2">
 		  <td class="contentbar2" colspan=4>
-			<b>&nbsp;Shipping Address<b> <i>(primary)</i>
+			<b>&nbsp;[L]Shipping Address[/L]<b> <i>([L]primary[/L])</i>
 		  </td>
 		</tr>
 		<tr>
@@ -15,24 +15,24 @@
 		</tr>
 		<tr>
 		  <td align=right class="contentbar1">
-			[error name=fname std_label="First Name" required=1]
+			[error name=fname std_label="[L]First Name[/L]" required=1]
 		  </td>
 		  <td align=left class="contentbar1">
 			<INPUT TYPE=text NAME=fname VALUE="[value fname]" size="20" maxlength="20">
 		  </td>
-		  <td align="right" class="contentbar1">[error name=lname std_label="Last Name" required=1]</td>
+		  <td align="right" class="contentbar1">[error name=lname std_label="[L]Last Name[/L]" required=1]</td>
 		  <td align="left" class="contentbar1"><INPUT TYPE=text NAME=lname VALUE="[value lname]" size="20"></td>
 		</tr>
 		<tr>
 		  <td align="right" class="contentbar1">
-			[error name=company std_label=Company required="[scratch dealer]"]
+			[error name=company std_label="[L]Company[/L]" required="[scratch dealer]"]
 		  </td>
 		  <td align="left" class="contentbar1" colspan=3>
 			<INPUT TYPE=text NAME=company VALUE="[value company]" size="20" maxlength="40">
 		  </td>
 		</tr>
 		<tr>
-		  <td align="right" class="contentbar1">[error name=address1 std_label=Address required=1]
+		  <td align="right" class="contentbar1">[error name=address1 std_label="[L]Address[/L]" required=1]
 		</td>
 		<td align="left" colspan=3 class="contentbar1">
 		  <INPUT TYPE=text NAME=address1 VALUE="[value address1]" size="40" maxlength="64">
@@ -46,7 +46,7 @@
 	  </tr>
 	  <tr class="contentbar1">
 		<td align="right" class="contentbar1">
-		  [error name=city std_label="City" required=1]
+		  [error name=city std_label="[L]City[/L]" required=1]
 		</td>
 		<td class="contentbar1" colspan=3>
 		  <INPUT TYPE=text NAME=city VALUE="[value city]" size="20" maxlength="20">
@@ -54,7 +54,7 @@
 	  </tr>
 	  <tr>
 		<td class="contentbar1" align=right>
-			[error name=state std_label="State/Province" required=1]
+			[error name=state std_label="[L]State/Province[/L]" required=1]
 		</td>
 		<td align="left" class="contentbar1" colspan=3>
 		  [loop search="
@@ -81,7 +81,7 @@
 	  </tr>
 	  <tr>
 		<td align="right" class="contentbar1">
-		  [error name=zip std_label="Zip/Postal Code" required=1] 
+		  [error name=zip std_label="[L]Zip/Postal Code[/L]" required=1] 
 		</td>
 		<td class="contentbar1" colspan=3>
 		  <INPUT TYPE=text NAME=zip VALUE="[value zip]" size="10" maxlength="10">
@@ -89,7 +89,7 @@
 	  </tr>
 	  <tr>
 		<td align="right" class="contentbar1">
-		  [error name=email std_label="Email Address" required=1]
+		  [error name=email std_label="[L]Email Address[/L]" required=1]
 		</td>
 		<td class="contentbar1" colspan=3>
 		  <INPUT TYPE=text NAME=email VALUE="[value email]" size="30">
@@ -97,14 +97,14 @@
 	  </tr>
 	  <tr>
 		<td align="right" class="contentbar1">
-		  Country
+		  [L]Country[/L]
 		</td>
 		<td colspan="3" class="contentbar1">
 		  <SELECT NAME=country onChange="this.form.submit()">
 		  [if value country =~ /(^$|US|CA)/]
-		  <OPTION VALUE="US"> United States
-		  <OPTION [selected country CA] VALUE="CA"> Canada
-		  <OPTION VALUE="JP"> Other
+		  <OPTION VALUE="US"> [L]United States[/L]
+		  <OPTION [selected country CA] VALUE="CA"> [L]Canada[/L]
+		  <OPTION VALUE="JP"> [L]Other[/L]
 		  [else]
 		  [loop option=country search="
 			ra=yes
@@ -119,18 +119,18 @@
 		  [/else]
 		  [/if]
 		  </SELECT>
-		  <small>(will update display)</small>
+		  <small>([L]will update display[/L])</small>
 		</td>
 	  </tr>
 	  <tr>
 		<td align="right" class="contentbar1">
-		  [error name=phone_day std_label="Daytime Phone" required=1]
+		  [error name=phone_day std_label="[L]Daytime Phone[/L]" required=1]
 		</td>
 		<td class="contentbar1">
 		  <INPUT TYPE=text NAME=phone_day VALUE="[value phone_day]" size="12" maxlength="20">
 		</td>
 		<td align="right" class="contentbar1">
-		  [error name=phone_night std_label="Evening Phone"]
+		  [error name=phone_night std_label="[L]Evening Phone[/L]"]
 		</td>
 		<td align="left" class="contentbar1">
 		  <INPUT TYPE=text NAME=phone_night VALUE="[value phone_night]" size="12" maxlength="20">
@@ -140,13 +140,13 @@
 	  <tr>
 		<td class="contentbar1">&nbsp;</td>
 		<td colspan="3" class="contentbar1">
-		  <B>Note:</B> [data session ship_message]
+		  <B>[L]Note[/L]:</B> [data session ship_message]
 		</td>
 	  </tr>
 	  [/if]                                                   
 	  <tr>
 		<td align="right" class="contentbar1">
-		  <b>Shipping method</b>
+		  <b>[L]Shipping method[/L]</b>
 		</td>
 		<td colspan="3" class="contentbar1">
 		  <SELECT NAME=mv_shipmode>
@@ -160,7 +160,7 @@
 	  <tr>
 		<td class="contentbar1">&nbsp;</td>
 		<td colspan="3" class="contentbar1">
-		  <i>We need the <b>bold fields</b> to process your order</i>
+		  <i>[L]We need the <b>bold fields</b> to process your order[/L]</i>
 		</td>
 	  </tr>
 	  <tr>



1.3       +18 -18    interchange/dist/foundation/include/checkout/shopping_cart


rev 1.3, prev_rev 1.2
Index: shopping_cart
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/include/checkout/shopping_cart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shopping_cart	5 Feb 2003 15:49:38 -0000	1.2
+++ shopping_cart	19 Mar 2003 17:09:04 -0000	1.3
@@ -1,11 +1,11 @@
         <table cellspacing="0" cellpadding="5" border="0" width="100%">
         <TR class="contentbar2">
-          <td class="contentbar2">&nbsp;<b>Remove</b></td>
-          <td class="contentbar2" align="center"><b>SKU</b></td>
-          <td class="contentbar2"><b>Description</b></td>
-          <td class="contentbar2"><b>Quantity</b></td>
-          <td class="contentbar2" align="center"><b>Price</b></td>
-          <td class="contentbar2"><b>Extension&nbsp;</b></td>
+          <td class="contentbar2">&nbsp;<b>[L]Remove[/L]</b></td>
+          <td class="contentbar2" align="center"><b>[L]SKU[/L]</b></td>
+          <td class="contentbar2"><b>[L]Description[/L]</b></td>
+          <td class="contentbar2"><b>[L]Quantity[/L]</b></td>
+          <td class="contentbar2" align="center"><b>[L]Price[/L]</b></td>
+          <td class="contentbar2"><b>[L]Extension[/L]&nbsp;</b></td>
         </TR>
         <TBODY>
 
@@ -23,7 +23,7 @@
             [if scratch dealer]
             [if-item-data pricing sku]
               <BR>[page quantity [item-code]]
-              QUANTITY PRICING</A>
+              [L]QUANTITY PRICING[/L]</A>
             [/if-item-data]
             [/if]
 
@@ -44,7 +44,7 @@
           </TD>
           <TD ALIGN=RIGHT>
             [item-discount-price]
-            [if discount [item-code]]<BR>Item is discounted [item-discount][/if]
+            [if discount [item-code]]<BR>[msg arg.0="[item-discount]"]Item is discounted %s[/msg][/if]
           </TD>
           <TD ALIGN=RIGHT>[item-subtotal]</TD>
         </TR>
@@ -56,14 +56,14 @@
             [page href="@@MV_PAGE@@" form="
                 separate_addresses=0
                 mv_action=return
-            "]Same shipping address</A><br>
-            [page href="ord/basket" form="edit_addresses=1"]Edit address</A><br>
-            [page href="ship_addresses" form="ui_return_to=@@MV_PAGE@@"]Add address</A>
+            "][L]Same shipping address[/L]</A><br>
+            [page href="ord/basket" form="edit_addresses=1"][L]Edit address[/L]</A><br>
+            [page href="ship_addresses" form="ui_return_to=@@MV_PAGE@@"][L]Add address[/L]</A>
             [else]
             [page href="@@MV_PAGE@@" form="
                 separate_addresses=1
                 mv_action=return
-            "]Separate shipping</A>
+            "][L]Separate shipping[/L]</A>
             [/else]
             [/if]
           </td>
@@ -80,7 +80,7 @@
         [else]
         <TR>
           <TD ALIGN=CENTER COLSPAN=6 class="contentbar2">
-            No items at the moment.
+            [L]No items at the moment.[/L]
           </TD>
         </TR>
 
@@ -100,7 +100,7 @@
           <td align="right">
             <table align="center" cellspacing="0" border="0">
             <tr>
-              <TD ALIGN=left class="contentbar1">Subtotal: </TD>
+              <TD ALIGN=left class="contentbar1">[L]Subtotal[/L]: </TD>
               <TD ALIGN=RIGHT class="contentbar1">[subtotal]</TD>
             </TR>
 		[if config Levies]
@@ -113,23 +113,23 @@
                         [/levy-list]
 		[else]
             <TR>
-              <TD ALIGN=left class="contentbar1">Sales Tax:</TD>
+              <TD ALIGN=left class="contentbar1">[L]Sales Tax[/L]:</TD>
               <TD ALIGN=RIGHT class="contentbar1">[salestax]</TD>
             </TR>
             <TR>
-              <TD ALIGN=left class="contentbar1">Shipping:</TD>
+              <TD ALIGN=left class="contentbar1">[L]Shipping[/L]:</TD>
               <TD ALIGN=RIGHT class="contentbar1">[shipping]</TD>
             </TR>
 			[if value mv_handling]
             <TR>
-              <TD ALIGN=left class="contentbar1">Handling:</TD>
+              <TD ALIGN=left class="contentbar1">[L]Handling[/L]:</TD>
               <TD ALIGN=RIGHT class="contentbar1">[handling]</TD>
             </TR>
 			[/if]
 		[/else]
 		[/if]
             <TR>
-              <TD ALIGN=left class="contentbar2">TOTAL:</TD>
+              <TD ALIGN=left class="contentbar2">[L]TOTAL[/L]:</TD>
               <TD ALIGN=RIGHT class="contentbar2">[total-cost]</TD>
             </tr>
             </table>