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

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

Browse Source
This commit is contained in:
lLefevre
2012-05-14 14:38:07 +00:00
parent ef31252386
commit 3ddf7259a2
78 changed files with 246 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+1 -1
View File
@@ -65,7 +65,7 @@
{if $generate}
<div class="module_confirmation conf confirm">
{$combinations_size} {l s='product(s) successfully created.'}
{l s='%d product(s) successfully created.' sprintf=$combinations_size}
</div>
{/if}
<script type="text/javascript" src="../js/attributesBack.js"></script>
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+1 -1
View File
@@ -51,7 +51,7 @@
<h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2>
<span>
{if $order->id}
<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #'}{$order->id|string_format:"%06d"}</a></span>
<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></span>
<br /><br />
{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
{else}
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+4 -4
View File
@@ -144,7 +144,7 @@
</table>
<div class="clear">&nbsp;</div>
{else}
{$customer->firstname} {$customer->lastname} {l s='has never contacted you'}
{l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]}
{/if}
{* display hook specified to this page : AdminCustomers *}
@@ -262,7 +262,7 @@
<div class="clear">&nbsp;</div>
{/if}
{else}
{$customer->firstname} {$customer->lastname} {l s='has not placed any orders yet'}
{l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]}
{/if}
{if $products AND count($products)}
@@ -334,7 +334,7 @@
{/foreach}
</table>
{else}
{$customer->firstname} {$customer->lastname} {l s='has not registered any addresses yet'}
{l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]}
{/if}
<div class="clear">&nbsp;</div>
@@ -362,7 +362,7 @@
{/foreach}
</table>
{else}
{$customer->firstname} {$customer->lastname} {l s='has no discount vouchers'}.
{l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}.
{/if}
<div class="clear">&nbsp;</div>
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+1 -1
View File
@@ -171,7 +171,7 @@
{foreach $input['values'] key=key item=category }
<tr class="alt_row" id="{$category.id_category}">
<td>{$category.path}</td>
<td>{l s='Discount:'} {$category.reduction}{l s='%'}</td>
<td>{l s='Discount: %d%' sprintf=$category.reduction}</td>
<td>
<a href="#" onclick="deleteCategoryReduction({$category.id_category});"><img src="../img/admin/delete.gif"></a>
<input type="hidden" class="category_reduction" name="category_reduction[{$category.id_category}]" value="{$category.reduction}">
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+2 -2
View File
@@ -31,7 +31,7 @@
<fieldset>
<ul>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Name:'}</span> {$group->name[$language->id]}</li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}</li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount: %d%' sprintf=$group->reduction}</span></li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Current category discount:'}</span>
{if !$categorieReductions}
{l s='None'}
@@ -40,7 +40,7 @@
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='Discount:'} {$category.reduction}{l s='%'}</td>
<td>{l s='Discount: %d%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
</table>
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+1 -1
View File
@@ -120,7 +120,7 @@
<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; width: 70%;">
<legend><img src="../img/admin/import.gif" />{l s='Import'}</legend>
<label class="clear">{l s='Your CSV file'} ({count($files_to_import)} {if count($files_to_import) > 1} {l s='files'}{else}{l s='file'}{/if}{l s='):'}</label>
<label class="clear">{if count($files_to_import) > 1}{l s='Your CSV file (%d files):' sprintf=files_to_import}{else}{l s='Your CSV file (%d file):' sprintf=files_to_import}{/if}</label>
<div class="margin-form">
{if count($files_to_import)}
<select name="csv">
admin-dev/themes/default/template/controllers/login/content.tpl
+1 -1
View File
@@ -33,7 +33,7 @@
<div id="container">
<div id="error" {if !isset($errors)}class="hide"{/if}>
{if isset($errors)}
<h3>{if $nbErrors > 1}{l s='There are'}{else}{l s='There is'}{/if} {$nbErrors}{if $nbErrors > 1} {l s='errors'}{else} {l s='error'}{/if}</h3>
<h3>{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}</h3>
<ol style="margin: 0 0 0 20px;">
{foreach from=$errors item="error"}
<li>{$error}</li>
admin-dev/themes/default/template/controllers/not_found/content.tpl
+1 -1
View File
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<h1>{l s='The controller'} {$controller} {l s='is missing or invalid.'}</h1>
<h1>{l s='The controller %s is missing or invalid.' sprintf=$controller}</h1>
<ul>
<li><a href="index.php">{l s='Go to Dashboard'}</a></li>
<li><a href="#" onclick="window.history.back();">{l s='Back to previous page'}</a></li>
admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
+1 -1
View File
@@ -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}
admin-dev/themes/default/template/controllers/orders/_documents.tpl
+1 -1
View File
@@ -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'}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+1 -1
View File
@@ -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}" />
admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
+2 -1
View File
@@ -45,7 +45,8 @@
<li>
{l s='The field `request_uri` is the URL from which the customers come to your website.'}<br />
{l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".<br />
{l s='This is interesting because you can add some tags or tokens in the links pointing to your website. For example, you can post a link'} "{$uri}index.php?prestashop" {l s='in the forum and get statistics by entering "%prestashop" in the field `request_uri`. You will get all the visitors coming from the forum.'}
{l s='This is interesting because you can add some tags or tokens in the links pointing to your website.'}
{l s='For example, you can post a link "%dindex.php?prestashop" in the forum and get statistics by entering "%prestashop" in the field `request_uri`. You will get all the visitors coming from the forum.'}
{l s='This method is more reliable than the `http_referer` one, but there is a danger: if a search engine read a page with your link, then it will be displayed in its results and you will have not only the forum visitors, but also the ones from the search engine.'}
</li>
<br />
admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
+1 -1
View File
@@ -75,7 +75,7 @@
{elseif $type == 'type_textfield'}
<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">
{foreach $datas as $data name='loop'}
<li>{if $data['name']}$data['name']{else}{l s='Text #'}loop.iteration{/if}{l s=':'} {$data['value']}</li>
<li>{if $data['name']}$data['name']{else}{l s='Text #%d' sprintf=$loop.iteration}{/if}{l s=':'} {$data['value']}</li>
{/foreach}
</ul>
{/if}
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
+1 -1
View File
@@ -46,7 +46,7 @@
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}
<u><b>{$limit_warning['needed_limit']}</b></u> {l s='at least.'} {l s='or edit the translation file manually.'}
{l s='%s at least or edit the translation file manually.' sprintf=$limit_warning['needed_limit']}
</div>
{else}
<form method="post" id="{$table}_form" action="{$url_submit}" class="form">
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
+1 -1
View File
@@ -48,7 +48,7 @@
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}
<u><b>{$limit_warning['needed_limit']}</b></u> {l s='at least.'} {l s='or edit the translation file manually.'}
{l s='%s at least or edit the translation file manually.' sprintf=$limit_warning['needed_limit']}
</div>
{else}
<form method="post" id="{$table}_form" action="{$url_submit}" class="form">
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
+1 -1
View File
@@ -45,7 +45,7 @@
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}
<u><b>{$limit_warning['needed_limit']}</b></u> {l s='at least.'} {l s='or edit the translation file manually.'}
{l s='%s at least or edit the translation file manually.' sprintf=$limit_warning['needed_limit']}
</div>
{else}
<form method="post" id="{$table}_form" action="{$url_submit}" class="form">
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+1 -1
View File
@@ -48,7 +48,7 @@
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}
<u><b>{$limit_warning['needed_limit']}</b></u> {l s='at least.'} {l s='or edit the translation file manually.'}
{l s='%s at least or edit the translation file manually.' sprintf=$limit_warning['needed_limit']}
</div>
{else}
<form method="post" id="{$table}_form" action="{$url_submit}" class="form">
admin-dev/themes/default/template/layout-ajax.tpl
+3 -3
View File
@@ -46,7 +46,7 @@
{if count($errors) == 1}
{$errors[0]}
{else}
{$errors|count} {l s='errors'}
{l s='%d errors' sprintf=$errors|count}
<br/>
<ol>
{foreach $errors AS $error}
@@ -79,13 +79,13 @@
<a id="hideWarn" href=""><img alt="X" src="../img/admin/close.png" /></a>
</span>
{if count($warnings) > 1}
{l s='There are'} {count($warnings)} {l s='warnings'}
{l s='There are %d warnings.' sprintf=count($warnings)}
<span style="margin-left:20px;" id="labelSeeMore">
<a id="linkSeeMore" href="#" style="text-decoration:underline">{l s='Click here to see more'}</a>
<a id="linkHide" href="#" style="text-decoration:underline;display:none">{l s='Hide warning'}</a>
</span>
{else}
{l s='There is'} {count($warnings)} {l s='warning'} :
{l s='There is %d warning.' sprintf=count($warnings)}
{/if}
<ul style="display:{if count($warnings) > 1}none{else}block{/if};" id="seeMore">
{foreach $warnings as $warning}
admin-dev/themes/default/template/layout.tpl
+2 -2
View File
@@ -38,7 +38,7 @@
{if count($errors) == 1}
{$errors[0]}
{else}
{$errors|count} {l s='errors'}
{l s='%d errors' sprintf=$errors|count}
<br/>
<ol>
{foreach $errors as $error}
@@ -71,7 +71,7 @@
<a id="hideWarn" href=""><img alt="X" src="../img/admin/close.png" /></a>
</span>
{if count($warnings) > 1}
{l s='There are'} {count($warnings)} {l s='warnings'}
{l s='There are %d warnings.' sprintf=count($warnings)}
<span style="margin-left:20px;" id="labelSeeMore">
<a id="linkSeeMore" href="#" style="text-decoration:underline">{l s='Click here to see more'}</a>
<a id="linkHide" href="#" style="text-decoration:underline;display:none">{l s='Hide warning'}</a>