dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15304 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-05-15 08:54:24 +00:00
parent f92adc9626
commit fa1caba6e5
71 changed files with 175 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/loyalty/views/templates/front/loyalty.tpl
+7 -1
View File
@@ -163,7 +163,13 @@
<td class="history_date">{dateFormat date=$discount->date_from}</td>
<td class="history_date">{dateFormat date=$discount->date_to}</td>
<td class="history_method bold">{if $discount->quantity > 0}{l s='To use' mod='loyalty'}{else}{l s='Used' mod='loyalty'}{/if}</td>
<td class="history_method"><a href="{$smarty.server.SCRIPT_NAME}" onclick="return false" class="tips" title="{l s='Generated by these following orders' mod='loyalty'}|{foreach from=$discount->orders item=myorder name=myLoop}{l s='Order #%d' sprintf=$myorder.id_order mod='loyalty'} ({displayPrice price=$myorder.total_paid currency=$myorder.id_currency}) : {if $myorder.points > 0}{$myorder.points} {l s='points.' mod='loyalty'}{else}{l s='Cancelled' mod='loyalty'}{/if}{if !$smarty.foreach.myLoop.last}|{/if}{/foreach}">{l s='more...' mod='loyalty'}</a></td>
<td class="history_method">
<a href="{$smarty.server.SCRIPT_NAME}" onclick="return false" class="tips" title="
{l s='Generated by these following orders' mod='loyalty'}|{foreach from=$discount->orders item=myorder name=myLoop}
{l s='Order #%d' sprintf=$myorder.id_order mod='loyalty'}
({displayPrice price=$myorder.total_paid currency=$myorder.id_currency}) :
{if $myorder.points > 0}{l s='%d points.' sprintf=$myorder.points mod='loyalty'}{else}{l s='Cancelled' mod='loyalty'}{/if}
{if !$smarty.foreach.myLoop.last}|{/if}{/foreach}">{l s='more...' mod='loyalty'}</a></td>
</tr>
{/foreach}
</tbody>
modules/loyalty/views/templates/hook/shopping-cart.tpl
+2 -2
View File
@@ -28,8 +28,8 @@
<p id="loyalty">
<img src="{$module_template_dir}images/loyalty.gif" alt="{l s='loyalty' mod='loyalty'}" class="icon" />
{if $points > 0}
{l s='By checking out of this shopping cart you can collect up to' mod='loyalty'} <b>{$points}
{if $points > 1}{l s='loyalty points' mod='loyalty'}{else}{l s='loyalty point' mod='loyalty'}{/if}</b>
{l s='By checking out of this shopping cart you can collect up to' mod='loyalty'} <b>
{if $points > 1}{l s='%d loyalty points' sprintf=$points mod='loyalty'}{else}{l s='%d loyalty point' sprintf=$points mod='loyalty'}{/if}</b>
{l s='that can be converted into a voucher of' mod='loyalty'} {convertPrice price=$voucher}{if isset($guest_checkout) && $guest_checkout}<sup>*</sup>{/if}.<br />
{if isset($guest_checkout) && $guest_checkout}<sup>*</sup> {l s='Not available for Instant checkout order' mod='loyalty'}{/if}
{else}