[-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf()

2012-05-14 14:38:07 +00:00
parent ef31252386
commit 3ddf7259a2
78 changed files with 246 additions and 441 deletions
@@ -82,7 +82,7 @@
 				{elseif ($type == Product::CUSTOMIZE_TEXTFIELD)}
 					<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">
 					{foreach from=$datas item=data}
-						<li>{if $data['name']}{$data['name']}{else}{l s='Text #'}{$data@iteration}{/if}{l s=':'} {$data['value']}</li>
+						<li>{if $data['name']}{l s='%s:' sprintf=$data['name']}{else}{l s='Text #%s:' sprintf=$data@iteration}{/if} {$data['value']}</li>
 					{/foreach}
 					</ul>
 				{/if}
@@ -74,7 +74,7 @@
 					{$document->getInvoiceNumberFormatted($current_id_lang)}
 				{/if}
 			{elseif get_class($document) eq 'OrderSlip'}
-				{l s='#'}{'%06d'|sprintf:$document->id}
+				{l s='#%d' sprintf=$document->id}
 			{/if} <img src="../img/admin/details.gif" alt="{l s='See the document'}" /></a></td>
 		<td class="document_amount">
 		{if get_class($document) eq 'OrderInvoice'}
@@ -153,7 +153,7 @@
 				<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
 				(<a href="mailto:{$customer->email}">{$customer->email}</a>)<br /><br />
 				{if ($customer->isGuest())}
-					{l s='This order has been placed by a'} <b>{l s='guest'}</b>
+					{l s='This order has been placed by a guest.'}
 					{if (!Customer::customerExists($customer->email))}
 					<form method="POST" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
 						<input type="hidden" name="id_lang" value="{$order->id_lang}" />