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

// Fix update english key of translations in all files

Browse Source
This commit is contained in:
lLefevre
2012-03-14 12:25:51 +00:00
parent d93eff8834
commit c21bef2acf
553 changed files with 17474 additions and 20745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+2 -2
View File
@@ -64,7 +64,7 @@
</tr>
<tr id="new_invoice" style="display:none;background-color:#e9f1f6;">
<td colspan="10">
<h3>{l s='New invoice informations'}</h3>
<h3>{l s='New invoice information'}</h3>
<label>{l s='Carrier:'}</label>
<div class="margin-form">
{$carrier->name}
@@ -72,7 +72,7 @@
<div class="margin-form">
<input type="checkbox" name="add_invoice[free_shipping]" value="1" />
<label class="t">{l s='Free shipping'}</label>
<p>{l s='If you don\'t select the "Free shipping", the normal shipping cost will be applied'}</p>
<p>{l s='If you don\'t select \\"Free shipping,\\" the normal shipping cost will be applied'}</p>
</div>
</td>
</tr>
admin-dev/themes/default/template/controllers/orders/form.tpl
+2 -2
View File
@@ -963,7 +963,7 @@
<tr>
<th height=39px" class="left">{l s='ID'}</th>
<th class="left">{l s='Date'}</th>
<th class="left">{l s='Produits'}</th>
<th class="left">{l s='Products'}</th>
<th class="left">{l s='Total paid'}</th>
<th class="left">{l s='Payment'}</th>
<th class="left">{l s='Status'}</th>
@@ -1068,7 +1068,7 @@
<textarea name="order_message" id="order_message" rows="3" cols="45"></textarea>
</div>
<div class="margin-form">
<a href="#" id="send_email_to_customer" class="button">{l s='Send an email to the customer with the link to process the payment.'}</a>
<a href="#" id="send_email_to_customer" class="button">{l s='Send an e-mail to the customer with the link to process the payment.'}</a>
</div>
<div class="margin-form">
<a target="_blank" id="go_order_process" href="" class="button">{l s='Go on payment page to process the payment.'}</a>
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+13 -13
View File
@@ -41,7 +41,7 @@
var use_taxes = {$order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
var token = "{$smarty.get.token|escape:'htmlall':'UTF-8'}";
var txt_add_product_stock_issue = "{l s='You want to add more product than available in stock, are you sure you want to add this quantity?' js=1}";
var txt_add_product_stock_issue = "{l s='You want to add more product than are available in stock, are you sure you want to add this quantity?' js=1}";
var txt_add_product_new_invoice = "{l s='Are you sure you want to create a new invoice?' js=1}";
var txt_add_product_no_product = "{l s='Error: No product has been selected' js=1}";
var txt_add_product_no_product_quantity = "{l s='Error: Quantity of product must be set' js=1}";
@@ -153,16 +153,16 @@
{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}" />
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to customer'}" /></p>
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform guest into customer'}" /></p>
{l s='This feature will generate a random password and send an e-mail to the customer'}
</form>
{else}
<div><b style="color:red;">{l s='A registered customer account exists with the same email address'}</b></div>
<div><b style="color:red;">{l s='A registered customer account already exists with this e-mail address'}</b></div>
{/if}
{else}
{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br />
{l s='Total paid since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
</fieldset>
{/if}
{/if}
@@ -214,7 +214,7 @@
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<p class="warn">{l s='Don\'t forget to update your conversion rate before make this change.'}</p>
<label>{l s='Change order\'s currency to:'}</label>
<label>{l s='Don\'t forget to update your conversion rate before make this change.'}</label>
<select name="new_currency">
{foreach from=$currencies item=currency_change}
{if $currency_change['id_currency'] != $order->id_currency}
@@ -358,7 +358,7 @@
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
<div class="clear" style="float: left; margin-right: 10px;">
<span>{l s='Recycled package:'}</span>
<span>{l s='Recycled packaging:'}</span>
{if $order->recyclable}
<img src="../img/admin/enabled.gif" />
{else}
@@ -366,7 +366,7 @@
{/if}
</div>
<div style="float: left;">
<span>{l s='Gift wrapping:'}</span>
<span>{l s='Gift-wrapping:'}</span>
{if $order->gift}
<img src="../img/admin/enabled.gif" />
</div>
@@ -513,8 +513,8 @@
{if !$order->hasBeenDelivered()}<div style="float: left;"><a href="#" class="add_product button"><img src="../img/admin/add.gif" alt="{l s='Add a product'}" /> {l s='Add a product'}</a></div>{/if}
<div style="float: right; margin-right: 10px" id="refundForm">
<!--
<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Proceed a standard refund'}" /> {l s='Proceed a standard refund'}</a>
<a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Proceed a partial refund'}" /> {l s='Proceed a partial refund'}</a>
<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Process a standard refund'}" /> {l s='Process a standard refund'}</a>
<a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Process a partial refund'}" /> {l s='Process a partial refund'}</a>
-->
</div>
<br clear="left" /><br />
@@ -523,7 +523,7 @@
<tr>
<th height="39" align="center" style="width: 7%">&nbsp;</th>
<th>{l s='Product'}</th>
<th style="width: 15%; text-align: center">{l s='UP'} <sup>*</sup></th>
<th style="width: 15%; text-align: center">{l s='Unit Price'} <sup>*</sup></th>
<th style="width: 4%; text-align: center">{l s='Qty'}</th>
{if ($order->hasBeenPaid())}<th style="width: 3%; text-align: center">{l s='Refunded'}</th>{/if}
{if ($order->hasBeenDelivered())}<th style="width: 3%; text-align: center">{l s='Returned'}</th>{/if}
@@ -563,7 +563,7 @@
</table>
<div style="float:left; width:280px; margin-top:15px;">
<sup>*</sup> {l s='According to the group of this customer, prices are printed:'}
<sup>*</sup> {l s='For this customer group, prices are displayed as:'}
{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
{l s='tax excluded.'}
{else}
@@ -689,7 +689,7 @@
<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
{/foreach}
</select><br /><br />
<b>{l s='Display to consumer?'}</b>
<b>{l s='Display to customer?'}</b>
<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
<p id="nbchars" style="display:inline;font-size:10px;color:#666;"></p><br /><br />
@@ -717,7 +717,7 @@
</div>
<br />
{/foreach}
<p class="info">{l s='When you read a message, please click on the green check.'}</p>
<p class="info">{l s='When you read a message, please click on the green check to mark it as read.'}</p>
</fieldset>
{/if}
</div>