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 ba52d26efc
commit 1998bb56d4
553 changed files with 17474 additions and 20745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
View File

@@ -382,7 +382,7 @@
<div class="clear">&nbsp;</div>
{else}
{l s='Administrator permissions can\'t be modified.'}
{l s='Administrator permissions cannot be modified.'}
{/if}
</div>

12
admin-dev/themes/default/template/controllers/accounting_export/content.tpl
View File

@@ -110,16 +110,16 @@
<div id="account_list">
<form id="{$table}_form" method="POST" action="{$smarty.server.REQUEST_URI}">
<label for="beginDate">{l s='Begin to:'}</label>
<label for="beginDate">{l s='Begin at:'}</label>
<div class="margin-form">
<input class="datepicker" id="begin_date" type="text" name="begin_date" value="{$begin_date}" />
<span class="input-error">{l s='The date has not the right format'}</span>
<span class="input-error">{l s='The date does not have the right format'}</span>
</div>
<label for="endDate">{l s='End to:'}</label>
<label for="endDate">{l s='End at:'}</label>
<div class="margin-form">
<input class="datepicker" id="end_date" type="text" name="end_date" value="{$end_date}" />
<span class="input-error">{l s='The date has not the right format'}</span>
<span class="input-error">{l s='The date does not have the right format'}</span>
</div>
<label for="format">{l s='File format:'}</label>
@@ -133,7 +133,7 @@
{l s='Text (TXT)'}
</option>
</select>
<span class="input-error">{l s='The date has not the right format'}</span>
<span class="input-error">{l s='The date does not have the right format'}</span>
</div>
<label for="type">{l s='Export Type:'}</label>
@@ -147,7 +147,7 @@
{l s='Reconciliation'}
</option>
</select>
<span class="input-error">{l s='The date has not the right format'}</span>
<span class="input-error">{l s='The date does not have the right format'}</span>
</div>
<div class="margin-form">

2
admin-dev/themes/default/template/controllers/attachments/list_action_delete.tpl
View File

@@ -26,7 +26,7 @@
<script>
function confirmProductAttached(productList)
{
var confirm_text = "{l s='This attachment is used by the following products:'}";
var confirm_text = "{l s='This attachment is associated with the following products:'}";
if (confirm('{$confirm}'))
return confirm(confirm_text + product_list);
return false;

4
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
View File

@@ -76,7 +76,7 @@
<form enctype="multipart/form-data" method="post" id="generator" action="{$url_generator}">
<fieldset style="margin-bottom: 35px;">
<legend><img src="../img/admin/asterisk.gif" />{l s='Attributes generator'}</legend>
<div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, click on the "Ctrl", select your attributes and click "Add".'}</div>
<div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, hold down the \\"Ctrl\\" key, select your attributes and click \\"Add\\".'}</div>
<div style="float: left; margin-right:50px;">
<div>
<select multiple name="attributes[]" id="attribute_group" style="width: 200px; height: 350px; margin-bottom: 10px;">
@@ -99,7 +99,7 @@
</div>
</div>
<br />
{l s='Add or modify attributes for product:'} <b>{$product_name}</b>
{l s='Add or modify attributes for:'} <b>{$product_name}</b>
<br /><br />
<div style="padding-top:10px; float: left; width: 570px;">
<div style="float:left;">

36
admin-dev/themes/default/template/controllers/backup/download/view.tpl
View File

@@ -32,38 +32,38 @@
<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
<p style="font-size: 13px;">
<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='Mb'})</a></b><br /><br />
{l s='Tip: You can also download this file by FTP, Backup files are located in "admin/backups" directory.'}</p>
<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over your FTP. Backup files are located in \\"admin/backups\\" directory.'}</p>
</fieldset><br /><br />
<div class="error width1" style="float: left; margin-right: 10px;">
<p>{l s='Disclaimer before creating a new Backup'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
<li>{l s='PrestaShop is not responsible for your database, Backups, restore and data.'}</li>
<li>{l s='PrestaShop is an Open-source software, you are using it at your own risk under the licence agreement.'}</li>
<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be deleted during Backup restore (see options).'}</li>
<li>{l s='Always verify the quality and integrity of your Backups files.'}</li>
<li>{l s='Always verify that your Backups files are complete, up-to-date and valid. Even if you had a success message during the Backup process.'}</li>
<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see \\"Backup options\\" below).'}</li>
<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a Backup on a live site.'}</li>
</ol>
</div>
<div class="warn width2" style="float: left;">
<p>{l s='How-to restore a database Backup in 10 easy steps'}</p>
<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<li>{l s='Turn off the "Enable Shop" option in the "Preferences" tab.'}</li>
<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the Backup integrity: look for errors, incomplete file. Verify all your data.'}</li>
<li>{l s='Ask your hosting provider for a "phpMyAdmin" access to your database'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen select the tab "Import"'}</li>
<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
<li>{l s='Check the max. allowed filesize (ie. Max: 16Mb)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
<li>{l s='Set \\"Enable Shop\\" to \\"No\\" in the Preferences > Maintenance tab.'}</li>
<li>{l s='Download the Backup from the list below or from your FTP server (in the folder \\"admin/backups\\").'}</li>
<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
<li>{l s='Ask your hosting provider for \\"phpMyAdmin\\" access to your database'}</li>
<li>{l s='Connect to \\"phpMyAdmin\\" and select your current database'}</li>
<li>{l s='Unless you enabled the \\"Drop existing tables\\" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen select the \\"Import\\" tab'}</li>
<li>{l s='Click on the \\"Browse...\\" button and select the Backup file from your hard drive'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
<li>{l s='Click on the \\"Go\\" button and wait during the import, the process can take several minutes'}</li>
</ol>
</div>

34
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
View File

@@ -31,37 +31,37 @@
<div class="error width1" style="float: left; margin-right: 10px;">
<p>{l s='Disclaimer before creating a new Backup'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
<li>{l s='PrestaShop is not responsible for your database, Backups, restore and data.'}</li>
<li>{l s='PrestaShop is an Open-source software, you are using it at your own risk under the licence agreement.'}</li>
<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be deleted during Backup restore (see options).'}</li>
<li>{l s='Always verify the quality and integrity of your Backups files.'}</li>
<li>{l s='Always verify that your Backups files are complete, up-to-date and valid. Even if you had a success message during the Backup process.'}</li>
<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see \\"Backup options\\" below).'}</li>
<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a Backup on a live site.'}</li>
</ol>
<br />
<form action="{$currentIndex}&add{$table}&token={$token}" method="post" style="text-align:center;">
<input type="submit" class="button" value="{l s='I read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
<input type="submit" class="button" value="{l s='I have read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
</form>
</div>
<div class="warn width2" style="float: left;">
<p>{l s='How-to restore a database Backup in 10 easy steps'}</p>
<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<li>{l s='Turn off the "Enable Shop" option in the "Preferences" tab.'}</li>
<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the Backup integrity: look for errors, incomplete file. Verify all your data.'}</li>
<li>{l s='Ask your hosting provider for a "phpMyAdmin" access to your database'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen select the tab "Import"'}</li>
<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
<li>{l s='Check the max. allowed filesize (ie. Max: 16Mb)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
<li>{l s='Set \\"Enable Shop\\" to \\"No\\" in the Preferences > Maintenance tab.'}</li>
<li>{l s='Download the Backup from the list below or from your FTP server (in the folder \\"admin/backups\\").'}</li>
<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
<li>{l s='Ask your hosting provider for \\"phpMyAdmin\\" access to your database'}</li>
<li>{l s='Connect to \\"phpMyAdmin\\" and select your current database'}</li>
<li>{l s='Unless you enabled the \\"Drop existing tables\\" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen select the \\"Import\\" tab'}</li>
<li>{l s='Click on the \\"Browse...\\" button and select the Backup file from your hard drive'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
<li>{l s='Click on the \\"Go\\" button and wait during the import, the process can take several minutes'}</li>
</ol>
</div>

2
admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
View File

@@ -30,7 +30,7 @@
<div class="conf">{l s='Beginning download ...'}</div>
<p>{l s='Back-up file should automatically download.'}</p>
<p>{l s='Backup file should automatically download.'}</p>
<p>{l s='If not,'} <b><a href="{$url_backup}">{l s='please click here!'}</a></b></p>

8
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
View File

@@ -28,12 +28,12 @@
<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
</select>
<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, and with or without shipping.'}</p>
</div>
<label>{l s='Total available'}</label>
<div class="margin-form">
<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
<p class="preference_description">{l s='The cart rule will be applied to the X first customers only.'}</p>
<p class="preference_description">{l s='The cart rule will be applied to the first X customers only.'}</p>
</div>
<label>{l s='Total available for each user'}</label>
<div class="margin-form">
@@ -138,7 +138,7 @@
{/if}
{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
<br />
<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Other cart rules compatibility'}</strong>
<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Compatibility with other cart rules'}</strong>
<div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
<table>
<tr>
@@ -177,7 +177,7 @@
{/foreach}
</table>
<a href="javascript:addProductRuleGroup();">
<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Add a new rule group'}
<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Product selection'}
</a>
</div>
{if $shops.unselected|@count + $shops.selected|@count > 1}

2
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
View File

@@ -33,7 +33,7 @@
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<div id="cart_rule_informations" class="cart_rule_tab">
<h4>{l s='Cart rule informations'}</h4>
<h4>{l s='Cart rule information'}</h4>
<div class="separation"></div>
{include file='controllers/cart_rules/informations.tpl'}
</div>

2
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
View File

@@ -40,7 +40,7 @@
<label>{l s='Priority'}</label>
<div class="margin-form">
<input type="text" name="priority" value="{$currentTab->getFieldValue($currentObject, 'priority')|intval}" />
<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of \\"1\\" will be processed before a cart rule with a priority of \\"2\\".'}</p>
</div>
<label>{l s='Status'}</label>
<div class="margin-form">

14
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
View File

@@ -29,7 +29,7 @@
{block name="override_tpl"}
<div id="container-customer">
<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='from'} {$cart->date_upd}</span></h2>
<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='on'} {$cart->date_upd}</span></h2>
<div class="separation"></div>
<div class="info-customer-left">
@@ -39,9 +39,9 @@
<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span>
{l s='#'}{$customer->id}<br />
<a style="text-decoration: underline; color:#268CCD;" href="mailto:{$customer->email}">{$customer->email}</a> <br /><br />
{l s='Account registered:'} {dateFormat date=$customer->date_add}<br />
{l s='Account registration date:'} {dateFormat date=$customer->date_add}<br />
{l s='Valid orders placed:'} <b>{$customer_stats.nb_orders}</b><br />
{l s='Total paid since registration:'} <b>{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</b><br />
{l s='Total spent since registration:'} <b>{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</b><br />
{else}
{l s='Guest not registered'}
{/if}
@@ -56,7 +56,7 @@
{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
{else}
{l s='No order created from this cart'}</span>
<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with this cart'}</a></p>
<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with from cart'}</a></p>
{/if}
</div>
<br style="clear:both;" />
@@ -70,8 +70,8 @@
<tr>
<th height="39" align="center" style="width: 60px">&nbsp;</th>
<th>{l s='Product'}</th>
<th style="width: 80px; text-align: center">{l s='UP'}</th>
<th style="width: 20px; text-align: center">{l s='Qty'}</th>
<th style="width: 80px; text-align: center">{l s='Unit price'}</th>
<th style="width: 20px; text-align: center">{l s='Quantity'}</th>
<th style="width: 30px; text-align: center">{l s='Stock'}</th>
<th style="width: 90px; text-align: right; font-weight:bold;">{l s='Total'}</th>
</tr>
@@ -182,7 +182,7 @@
</table>
{/if}
<div style="float:left; margin-top:15px;">
{l s='According to the group of this customer, prices are printed:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
{l s='For this customer\'s group, prices are displayed as:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
</div>
<div class="clear" style="height:20px;">&nbsp;</div>

12
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
View File

@@ -50,22 +50,22 @@
{if $need_delete_mode}
{l s='Do you want to delete products too?'}
{else}
{l s='Deleting this category will remove products linked with this category and without any others. Are you sure you want to continue?'}
{l s='Deleting this category will remove products linked only within this category and no others. Are you sure you want to continue?'}
{/if}
</h2>
{if $need_delete_mode}
<ul class="listForm">
<li>
<input type="radio" name="deleteMode" value="linkanddisable" id="deleteMode_linkanddisable" />
<label for="deleteMode_linkanddisable" style="float:none;">{l s='No, I want to link products without others categories with the parent category and disable them.'}</label>
<label for="deleteMode_linkanddisable" style="float:none;">{l s='No, I want to link products without other categories within the parent category and then disable them.'}</label>
</li>
<li>
<input type="radio" name="deleteMode" value="link" id="deleteMode_link" />
<label for="deleteMode_link" style="float:none;">{l s='No, I want to link products without others categories with the parent category.'}</label>
<label for="deleteMode_link" style="float:none;">{l s='No, I want to link products without other categories within the parent category.'}</label>
</li>
<li>
<input type="radio" name="deleteMode" value="delete" id="deleteMode_delete" />
<label for="deleteMode_delete" style="float:none">{l s='Yes, I want to remove products linked with this category and without any others categories.'}</label>
<label for="deleteMode_delete" style="float:none">{l s='Yes, I want to remove products linked only within this category and no others.'}</label>
</li>
</ul>
{else}
@@ -83,8 +83,8 @@
{/if}
{/foreach}
<br />
<input type="submit" name="cancel" class="button" value="{l s=' Cancel '}" />
<input type="submit" class="button" value="{l s=' Validate '}" />
<input type="submit" name="cancel" class="button" value="{l s='Cancel'}" />
<input type="submit" class="button" value="{l s='Validate'}" />
</div>
</form>
<div class="clear">&nbsp;</div>

20
admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
View File

@@ -32,18 +32,18 @@
<textarea id="ordered_fields" name="address_layout" style="width: 300px;height: 140px;">{$input.address_layout}</textarea>
</div>
<div style="float:left; margin-left:20px; width:340px;">
{l s='Liable fields for the address information (click to have more details):'} {$input.display_valid_fields}
{l s='Required fields for the address (click for more details):'} {$input.display_valid_fields}
</div>
<div class="clear"></div>
<div style="margin:10px 0 10px 0;">
<a id="useLastDefaultLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_address_layout}', 'lastDefault');" class="button">
{l s='Use the last registered layout'}</a>
{l s='Use the last registered format'}</a>
<a id="useDefaultLayoutSystem" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_default_layout}', 'defaultSystem');" class="button">
{l s='Use a default layout'}</a>
{l s='Use the default format'}</a>
<a id="useCurrentLastModifiedLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout(lastLayoutModified, 'currentModified')" class="button">
{l s='Use my current modified layout'}</a>
{l s='Use my current modified format'}</a>
<a id="eraseCurrentLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('', 'erase');" class="button">
{l s='Clean layout'}</a>
{l s='Clear format'}</a>
<div style="margin-top:10px; padding-top:5px; height:10px;" id="explanationText"></div>
</div>
</div>
@@ -68,19 +68,19 @@
});
$('#useLastDefaultLayout').mouseover(function() {
switchExplanationText("{l s='Will display back your last registered layout'}");
switchExplanationText("{l s='This will restore your last registered address format'}");
});
$('#useDefaultLayoutSystem').mouseover(function() {
switchExplanationText("{l s='Will display a default layout for this country'}");
switchExplanationText("{l s='This will restore the default address format for this country'}");
});
$('#useCurrentLastModifiedLayout').mouseover(function() {
switchExplanationText("{l s='Will display back you\'re current editing layout'}");
switchExplanationText("{l s='This will restore your current address format'}");
});
$('#eraseCurrentLayout').mouseover(function() {
switchExplanationText("{l s='Will delete the current layout'}");
switchExplanationText("{l s='This will delete the current address format'}");
});
$('#need_zip_code_on, #need_zip_code_off').change(function() {
@@ -109,7 +109,7 @@
}
function resetLayout(defaultLayout, type) {
if (confirm("{l s='Are you sure to apply this selection ?'}"))
if (confirm("{l s='Are you sure you want to restore the default address format for this country?'}"))
$("#ordered_fields").val(unescape(defaultLayout.replace(/\+/g, " ")));
}

2
admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
View File

@@ -55,7 +55,7 @@
{/if}
{if $total_thread == 0}
<span class="message-mail">{l s='No new message'}</span>
<span class="message-mail">{l s='No new messages'}</span>
{else}
<a href="{$currentIndex}&token={$token}&id_customer_thread={$id_customer_thread}&viewcustomer_thread" class="button">
{$total_thread}

4
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
View File

@@ -43,7 +43,7 @@
<ul class="listForm">
<li>
<input type="radio" name="deleteMode" value="real" id="deleteMode_real" />
<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) for real, all data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) for real. All data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
</li>
<li>
<input type="radio" name="deleteMode" value="deleted" id="deleteMode_deleted" />
@@ -59,7 +59,7 @@
<input type="hidden" name="{$key}" value="{$value}" />
{/if}
{/foreach}
<br /><input type="submit" class="button" value="{l s=' Delete '}" />
<br /><input type="submit" class="button" value="{l s='Delete'}" />
</div>
</form>
<div class="clear">&nbsp;</div>

10
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
View File

@@ -94,11 +94,11 @@
{if !$customer_exists}
<form method="POST" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
<input type="hidden" name="id_lang" value="{$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 to customer account'}" /></p>
{l s='This feature generates a random password and sends an e-mail to the customer'}
</form>
{else}
</div><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>
{/if}
</div>
{/if}
@@ -111,7 +111,7 @@
<h2>
<img src="../img/admin/cms.gif" /> {l s='Add a private note'}
</h2>
<p>{l s='This note will be displayed to all the employees but not to the customer.'}</p>
<p>{l s='This note will be displayed to all employees but not to the customer.'}</p>
<form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note">
<textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br />
<input type="submit" id="submitCustomerNote" class="button" value="{l s=' Save '}" style="float:left;margin-top:5px" disabled="disabled" />
@@ -201,7 +201,7 @@
<th class="left">{l s='Payment'}</th>
<th class="left">{l s='State'}</th>
<th class="left">{l s='Products'}</th>
<th class="left">{l s='Total paid'}</th>
<th class="left">{l s='Total spent'}</th>
<th class="center">{l s='Actions'}</th>
</tr>
{foreach $orders_ok AS $key => $order}
@@ -238,7 +238,7 @@
<th class="center">{l s='Payment'}</th>
<th class="center">{l s='State'}</th>
<th class="center">{l s='Products'}</th>
<th class="center">{l s='Total paid'}</th>
<th class="center">{l s='Total spent'}</th>
<th class="center">{l s='Actions'}</th>
</tr>
{foreach $orders_ko AS $key => $order}

6
admin-dev/themes/default/template/controllers/emails/content.tpl
View File

@@ -25,11 +25,11 @@
*}
<script type="text/javascript">
var textMsg = "{l s='This is a test message, your server is now available to send email'}";
var textMsg = "{l s='This is a test message, your server is now configured to send e-mail'}";
var textSubject = "{l s='Test message - Prestashop'}";
var textSendOk = "{l s='Mail is sent'}";
var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified'}";
var textSendError= "{l s='Error: please check your configuration'}";
var errorMail = "{l s='This email address is wrong!'}";
var errorMail = "{l s='This e-mail address is invalid'}";
$(document).ready(function() {
if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)
$('#smtp').show();

2
admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl
View File

@@ -67,7 +67,7 @@
{block name="label"}
{if $input.type == 'text' && $input.name == 'name'}
<div class="hint" name="help_box" style="display:block;">{l s='You can\'t edit GroupShop when you have more than one Shop'}</div><br />
<div class="hint" name="help_box" style="display:block;">{l s='You can\'t edit GroupShop when you have more than one shop'}</div><br />
{/if}
{if isset($input.label)}

8
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
View File

@@ -30,7 +30,7 @@
{if $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div class="separation"></div>
<label>{l s='Modules restrictions: '}</label>
<label>{l s='Modules restrictions:'}</label>
</div>
{elseif $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
@@ -183,12 +183,12 @@
<div style="display:none" id="group_discount_category_fancybox">
<fieldset style="text-align:left"><legend><img src="../img/admin/tab-groups.gif" />{l s='New group category discount'}</legend>
<div class="hintGroup" style="font-size: 13px;">
{l s='Beware the reduction applied to a category does not stack with the overall reduction but replaces it. The group is automatically added to the category.'}
{l s='Caution: the discount applied to a category does not stack with the overall reduction but instead replaces it.'}
</div>
{$categoryTreeView}
<div class="warn">{l s='Only products that have this category as the default category will be affected'}</div>
<div class="clear">&nbsp;</div>
<label>{l s='Discount (in %):'}</label>
<label>{l s='Discount (%):'}</label>
<input type="text" name="category_reduction_fancybox" id="category_reduction_fancybox" value="0.00" size="33">
<div class="clear">&nbsp;</div>
<button onclick="addCategoryReduction();" class="button">{l s='add'}</button>
@@ -258,7 +258,7 @@
<tr>
<td style="text-align:center">
<button style="width:100%;margin-top:5px" id="authorize_list" onclick="toogleCheck(this);return false;" class="button">{l s='Select all'}</button>
<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="authorizeChecked();return false;" class="button">{l s='<< Unauthorize'}</button>
<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="authorizeChecked();return false;" class="button">{l s=''}</button>
</td>
<td style="text-align:center">
<button style="width:100%;margin-top:5px"id="unauthorize_list" onclick="toogleCheck(this);return false;" class="button">{l s='Select all'}</button>

2
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
View File

@@ -58,7 +58,7 @@
</li>
</ul>
</fieldset>
<h2>{l s='Customer members of this group'}</h2>
<h2>{l s='Members of this customer group'}</h2>
{$customerList}
{/block}

12
admin-dev/themes/default/template/controllers/home/content.tpl
View File

@@ -35,14 +35,14 @@
{if $upgrade}
<div id="blockNewVersionCheck">
{if $upgrade->need_upgrade}
<div class="warning warn" style="margin-bottom:10px;"><h3>{l s='New PrestaShop version available'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s='Download'} {$upgrade->version_name}</a> !</h3></div>
<div class="warning warn" style="margin-bottom:10px;"><h3>{l s='New version of PrestaShop is available'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s='Download'} {$upgrade->version_name}</a> !</h3></div>
{/if}
</div>
{else}
<p>{l s='Update notification unavailable'}</p>
<p>&nbsp;</p>
<p>{l s='To receive PrestaShop update warnings, you need to activate '} <b>allow_url_fopen</b> [<a href="http://www.php.net/manual/{$isoUser}/ref.filesystem.php">{l s='more info on php.net'}</a>]</p>
<p>{l s='If you don\'t know how to do that, please contact your host administrator !'}</p><br />
<p>{l s='To receive PrestaShop update warnings, you need to activate'} <b>allow_url_fopen</b> [<a href="http://www.php.net/manual/{$isoUser}/ref.filesystem.php">{l s='more info on php.net'}</a>]</p>
<p>{l s='If you don\'t know how to do this, please contact your hosting provider!'}</p><br />
{/if}
{if $employee->bo_show_screencast}
<div id="adminpresentation" style="display:block;">
@@ -51,12 +51,12 @@
<a href="{$protocol}://screencasts.prestashop.com/v1.5/screencast.php?iso_lang={$isoUser}" id="screencast_fancybox"><img height="128" width="220" src="../img/admin/preview_fr.jpg" /><span class="mask-player"></span></a>
</div>
<div id="video-content">
<p>{l s='With PrestaShop, take part in the adventure of e-commerce with ease. PrestaShop is fast, powerful, and customizable, with 275 features for you to take advantage of to create a world of opportunities without limits. Discover the solution that has already conquered more than 100,000 merchants worldwide!'}</p>
<p>{l s='Take part in the e-commerce adventure with PrestaShop, the fast, powerful, and customizable e-commerce solution. With more than 275 features, PrestaShop will help you create a world of opportunities without limits. Discover the solution that has already conquered more than 100,000 merchants worldwide!'}</p>
</div>
<div id="footer_iframe_home">
<!--<a href="#">{l s='View more video tutorials'}</a>-->
<input type="checkbox" id="screencast_dont_show_again">
<label for="screencast_dont_show_again">{l s='don\'t show again'}</label>
<label for="screencast_dont_show_again">{l s='Do not show again'}</label>
</div>
<div class="separation"></div>
</div>
@@ -125,7 +125,7 @@ $(document).ready(function() {
<div id="column_right">
<h2>{l s='Your Indicators'}</h2>
<h2>{l s='Your Information'}</h2>
{$monthly_statistics}
{$customers_service}
{$stats_sales}

2
admin-dev/themes/default/template/controllers/home/optimizationTips.tpl
View File

@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="admin-box1">
<h5>{l s='A good beginning...'}
<h5>{l s='Configuration checklist'}
<span style="float:right">
<a id="optimizationTipsFold" href="#">
<img alt="v" src="../img/admin/{if $hide_tips}arrow-down.png{else}arrow-up.png{/if}" />

18
admin-dev/themes/default/template/controllers/images/content.tpl
View File

@@ -28,11 +28,11 @@
{if isset($display_regenerate)}
<h2 class="space">{l s='Regenerate thumbnails'}</h2>
{l s='Regenerates thumbnails for all existing product images'}<br /><br />
{l s='Regenerates thumbnails for all existing images'}<br /><br />
<div class="width4">
<div class="warn">
{l s='Please be patient, as this can take several minutes'}<br />
{l s='Be careful! Manually generated thumbnails will be erased by automatically generated thumbnails.'}
{l s='Please be patient, this can take several minutes'}<br />
{l s='Be careful! Manually uploaded thumbnails will be erased and replaced by automatically generated thumbnails.'}
</div>
</div>
<form action="{$current}&token={$token}" method="post">
@@ -69,7 +69,7 @@
<label>{l s='Erase previous images'}</label>
<div class="margin-form">
<input name="erase" type="checkbox" value="1" checked="checked" />
<p>{l s='Uncheck this checkbox only if your server timed out and you need to resume the regeneration.'}</p>
<p>{l s='Deselect this checkbox only if your server timed out and you need to resume the regeneration.'}</p>
</div>
<div class="clear"></div>
<center><input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" /></center>
@@ -79,23 +79,23 @@
{if isset($display_move)}
<br /><h2 class="space">{l s='Move images'}</h2>
{l s='A new storage system for product images is now used by PrestaShop. It offers better performance if your shop has a very large number of products.'}<br />
{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a very large number of products.'}<br />
<br />
{if $safe_mode}
<div class="warn">
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should continue to use the actual system.'}
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive \\"safe_mode\\" is activated). You should continue to use the existing system.'}
</div>
{else}
<form action="{$current}&token={$token}" method="post">
<fieldset class="width4">
<legend><img src="../img/admin/picture.gif" /> {l s='Move images'}</legend><br />
{l s='You can choose to keep your images stored in the previous system - nothing wrong with that.'}<br />
{l s='You can also decide to move your images to the new storage system: in this case, click on the "Move images" button below. Please be patient, as this can take several minutes.'}
{l s='You can choose to keep your images stored in the previous system - there is nothing wrong with that.'}<br />
{l s='You can also decide to move your images to the new storage system: in this case, click on the \\"Move images\\" button below. Please be patient, this can take several minutes.'}
<br /><br />
<div class="hint clear" style="display: block;">&nbsp;
{l s='After moving all of your product images, for best performance go to the '}
<a style="text-decoration:underline" href="{$link_ppreferences}">{l s='product preferences tab'}</a>
{l s=' and set "Use the legacy image filesystem" to NO.'}
{l s='and set \\"Use the legacy image filesystem\\" option to \\"No\\".'}
</div>
<center><input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" /></center>
</fieldset>

36
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -40,7 +40,7 @@
{if $module_confirmation}
<div class="module_confirmation conf confirm"><img src="../img/admin/ok.gif" alt="" title="" style="margin-right:5px; float:left;" />
{l s='The .CSV file has been imported into your shop.'}
{l s='Your .CSV file has been sucessfully imported into your shop.'}
</div>
{/if}
@@ -89,29 +89,29 @@
<div class="margin-form" style="padding-left:190px;">
<input name="file" type="file" />
<p class="preference_description">
{l s='You can also upload your file via FTP in the following directory:'} {$path_import}.
{l s='You can also upload your file via FTP to the following directory:'} {$path_import}.
</p>
</div>
<div class="margin-form" style="padding-left:190px;">
<input type="submit" name="submitFileUpload" value="{l s='Upload'}" class="button" />
<p class="preference_description">
{l s='Allowed files are only UTF-8 and iso-8859-1 encoded ones'}
{l s='Only UTF-8 and ISO-8859-1 encoding are allowed'}
</p>
</div>
</form>
<div class="clear">&nbsp;</div>
<div style="width:50%; margin: 0 auto;">
{l s='Note that our samples our available, below.'}
{l s='Note that our samples are available below.'}
<div class="clear">&nbsp;</div>
<ul id="sample_files_import">
<li><a href="../docs/csv_import/categories_import.csv">{l s='Categories sample file'}</a></li>
<li><a href="../docs/csv_import/products_import.csv">{l s='Products sample file'}</a></li>
<li><a href="../docs/csv_import/combinations_import.csv">{l s='Combinations sample file'}</a></li>
<li><a href="../docs/csv_import/customers_import.csv">{l s='Customers sample file'}</a></li>
<li><a href="../docs/csv_import/addresses_import.csv">{l s='Addresses sample file'}</a></li>
<li><a href="../docs/csv_import/manufacturers_import.csv">{l s='Manufacturers sample file'}</a></li>
<li><a href="../docs/csv_import/suppliers_import.csv">{l s='Suppliers sample file'}</a></li>
<li><a href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
<li><a href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
<li><a href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a></li>
<li><a href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a></li>
<li><a href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
<li><a href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
<li><a href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
<li><a href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
<li><a href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
</ul>
@@ -169,7 +169,7 @@
</select>
{l s='The locale must be installed'}
</div>
<label for="convert" class="clear">{l s='iso-8859-1 encoded file?'} </label>
<label for="convert" class="clear">{l s='ISO-8859-1 encoded file?'} </label>
<div class="margin-form">
<input name="convert" id="convert" type="checkbox" style="margin-top: 6px;"/>
</div>
@@ -183,11 +183,11 @@
<input type="text" size="2" value="," name="multiple_value_separator"/>
{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
</div>
<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import ?'} </label>
<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
<div class="margin-form">
<input name="truncate" id="truncate" type="checkbox"/>
</div>
<label for="match_ref" class="clear" style="display: none">{l s='Use product reference as key ?'}</label>
<label for="match_ref" class="clear" style="display: none">{l s='Use product reference as key?'}</label>
<div class="margin-form">
<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
</div>
@@ -196,7 +196,7 @@
</div>
<div class="warn import_products_categories" style="margin-top: 20px;">
<p>{l s='Note that the category import does not support categories of the same name.'}</p>
<p>{l s='Note that you can have serveral products with the same reference.'}</p>
<p>{l s='Note that you can have several products with the same reference.'}</p>
</div>
<div class="warn import_supply_orders_details" style="margin-top: 20px; display:none">
<p>{l s='Importing Supply Order Details will first reset the products ordered, if any.'}</p>
@@ -207,7 +207,7 @@
<ul>
<li>{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a></li>
<li>
{l s='Read more about CSV format at: '} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
</ul>
</div>
{/if}
@@ -217,7 +217,7 @@
<fieldset style="display:block;">
<legend>
<img src="../img/admin/import.gif" />{l s='Fields available'}
<img src="../img/admin/import.gif" />{l s='Available fields'}
</legend>
<div id="availableFields">
@@ -225,7 +225,7 @@
</div>
<div class="clear">
<br /><br />{l s='* Required Fields'}
<br /><br />{l s='* Required field'}
</div>
</fieldset>

4
admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
View File

@@ -28,7 +28,7 @@
{block name="override_tpl"}
<script type="text/javascript">
var errorEmpty = "{l s='Please enter a name to save.'}"
var errorEmpty = "{l s='Please name your matching configuration to save.'}"
</script>
<div id="container-customer">
<h2>{l s='View your data'}</h2>
@@ -115,7 +115,7 @@
<table>
<tr>
<td colspan="3" align="center">
<input name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" value="{l s='Import CSV data'}" class="button" />
<input name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" value="{l s='Import .CSV data'}" class="button" />
</td>
</tr>
<tr>

36
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
View File

@@ -47,9 +47,9 @@
};
if (json.missing.length || json.updated.length)
$('#changedFiles').html('<div class="warn">{l s='Changed / missing files have been detected'}</div>');
$('#changedFiles').html('<div class="warn">{l s='Changed/missing files have been detected'}</div>');
else
$('#changedFiles').html('<div class="conf">{l s='No change has been detected on your files'}</div>');
$('#changedFiles').html('<div class="conf">{l s='No change has been detected in your files'}</div>');
$.each(tab, function(key, lang)
{
@@ -71,15 +71,15 @@
</script>
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Information'}</legend>
<p>{l s='This information must be indicated when you report a bug on our bug tracker or if you report a problem on our forum.'}</p>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Configuration Information'}</legend>
<p>{l s='This information must be provided when you report an issue on our bug tracker or forum.'}</p>
</fieldset>
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
<h3>{l s='Server information'}</h3>
<p>
<b>{l s='Prestashop Version'}:</b> {$version.ps}
<b>{l s='Prestashop version'}:</b> {$version.ps}
</p>
{if count($uname)}
@@ -89,10 +89,10 @@
{/if}
<p>
<b>{l s='Server software Version'}:</b> {$version.server}
<b>{l s='Server software version'}:</b> {$version.server}
</p>
<p>
<b>{l s='PHP Version'}:</b> {$version.php}
<b>{l s='PHP version'}:</b> {$version.php}
</p>
{if $apache_instaweb}
<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
@@ -101,10 +101,10 @@
<hr />
<h3>{l s='Database information'}</h3>
<p>
<b>{l s='MySQL Version'}:</b> {$database.version}
<b>{l s='MySQL version'}:</b> {$database.version}
</p>
<p>
<b>{l s='MySQL Engine'}:</b> {$database.engine}
<b>{l s='MySQL engine'}:</b> {$database.engine}
</p>
<p>
<b>{l s='Tables prefix'}:</b> {$database.prefix}
@@ -113,20 +113,20 @@
<hr />
<h3>{l s='Store information'}</h3>
<p>
<b>{l s='URL of your website'}:</b> {$shop.url}
<b>{l s='Shop URL'}:</b> {$shop.url}
</p>
<p>
<b>{l s='Theme name used'}:</b> {$shop.theme}
<b>{l s='Current theme in use'}:</b> {$shop.theme}
</p>
<hr />
<h3>{l s='Mail information'}</h3>
<h3>{l s='Mail configuration'}</h3>
<p>
<b>{l s='Mail method'}:</b>
{if $mail}
{l s='You use PHP mail() function.'}</p>
{l s='You are using the PHP mail() function.'}</p>
{else}
{l s='You use your own SMTP parameters'}</p>
{l s='You are using your own SMTP parameters.'}</p>
<p>
<b>{l s='SMTP server'}:</b> {$smtp.server}
</p>
@@ -156,7 +156,7 @@
<hr />
<h3>{l s='Your information'}</h3>
<p>
<b>{l s='Information from you'}:</b> {$user_agent}
<b>{l s='Your web browser'}:</b> {$user_agent}
</p>
</fieldset>
<br />
@@ -168,7 +168,7 @@
<span style="color:green;font-weight:bold;">OK</span>
</p>
{else}
<span style="color:red">{l s='Please consult the following error(s)'}</span>
<span style="color:red">{l s='Please fix the following error(s)'}</span>
</p>
<ul>
{foreach from=$testsRequired item='value' key='key'}
@@ -185,7 +185,7 @@
<span style="color:green;font-weight:bold;">OK</span>
</p>
{else}
<span style="color:red">{l s='Please consult the following error(s)'}</span>
<span style="color:red">{l s='Please fix the following error(s)'}</span>
</p>
<ul>
{foreach from=$testsOptional item='value' key='key'}
@@ -201,7 +201,7 @@
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='List of changed files'}</legend>
<div id="changedFiles"><img src="../img/admin/ajax-loader.gif" /> {l s='Checking files ...'}</div>
<div id="changedFiles"><img src="../img/admin/ajax-loader.gif" /> {l s='Checking files...'}</div>
</fieldset>
{/block}

4
admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
View File

@@ -38,8 +38,8 @@
{block name=script}
var langPackOk = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='A language pack is available for this ISO (name is'}";
var langPackVersion = "{l s='The compatible Prestashop version for this language and your system is: '}";
var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download above under "Localization - Translations"'}";
var langPackVersion = "{l s='The compatible Prestashop version for this language and your system is:'}";
var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download above under \\"Localization - Translations\\"'}";
var noLangPack = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='No language pack available on prestashop.com for this ISO code'}";
var download = "{l s='Download'}";

8
admin-dev/themes/default/template/controllers/login/content.tpl
View File

@@ -80,17 +80,17 @@
<div style="margin:30px;">
<p><span>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}<br /><br />
<ul>
<li>{l s='delete the /install folder'}</li>
<li>{l s='renamed the /admin folder (eg.) /admin'}{$randomNb}</li>
<li>{l s='deleted the /install folder'}</li>
<li>{l s='renamed the /admin folder (e.g. /admin123)'}{$randomNb}</li>
</ul>
<br />{l s='Please then access this page by the new url (eg.) http://www.domain.tld/admin'}{$randomNb}</span></p>
<br />{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin123)'}{$randomNb}</span></p>
</div>
{/if}
<div id="forgot_password" style="display:none">
<h1>{$shop_name}</h1>
<form action="" method="post" onsubmit="doAjaxForgot();return false;">
<div class="page-title center">{l s='Forgot your password?'}</div><br />
<span style="font-weight: bold;">{l s='Please, enter your e-mail address the one you wrote during your registration in order to receive your access codes by e-mail'}</span><br />
<span style="font-weight: bold;">{l s='Please enter the e-mail address you provided during the registration process in order to receive your access code by e-mail'}</span><br />
<input style="margin-top:20px" type="text" name="email_forgot" id="email_forgot" class="input" />
<div id="submit">
<input type="submit" name="Submit" value="{l s='Send'}" class="button" style="float:left" />

2
admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl
View File

@@ -35,7 +35,7 @@
<input type="radio" name="{$key}" id="{$key}_off" value="0" {if !$field['value']} checked="checked"{/if}{if isset($field['js']['off'])} {$field['js']['off']}{/if}/>
<label class="t" for="{$key}_off"> {l s='No'}</label>
{else}
<span class="warning_mod_rewrite" style="display:block;height:15px">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you have to active this mod.'}</span>
<span class="warning_mod_rewrite" style="display:block;height:15px">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you must activate this mod.'}</span>
<div class="clear"></div>
{/if}
{else}

22
admin-dev/themes/default/template/controllers/modules/filters.tpl
View File

@@ -30,12 +30,12 @@
<!--start addons login-->
<div class="filter-module" id="addons_login_div">
<p>{l s='You are logged on PrestaShop Addons'}</p>
<p>{l s='You are logged into PrestaShop Addons'}</p>
<div style="float:right">
<label><img src="themes/default/img/module-profile.png" /> {l s='Welcome'} {$username_addons}</label>
<label>|</label>
<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Logout from addons'}</a></label>
<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons'}</a></label>
</div>
</div>
@@ -46,9 +46,9 @@
{if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'}
<div class="warn">
<b>{l s='If you want to be able to fully use the AdminModules pannel and have free modules available, you should enable the following configuration on your server :'}</b><br />
<b>{l s='If you want to be able to fully use the AdminModules panel and have free modules available, you should enable the following configuration on your server:'}</b><br />
{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
{if $check_openssl eq 'ko'}- {l s='Enable php openssl extension'}<br />{/if}
{if $check_openssl eq 'ko'}- {l s='Enable php openSSL extension'}<br />{/if}
</div>
{else}
@@ -56,9 +56,9 @@
<!--start addons login-->
<div class="filter-module" id="addons_login_div">
<p>{l s='You have a PrestaShop Addons account ?'}</p>
<p>{l s='Do you have a PrestaShop Addons account?'}</p>
<form id="addons_login_form" method="post">
<label>{l s='Login Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
<label>{l s='Login to Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
<label>{l s= 'Password Addons'} :</label> <input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
<input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}">
<br /><span id="addons_loading" style="color:red"></span>
@@ -88,20 +88,20 @@
<select name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Native Modules'}</option>
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partners Modules'}</option>
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules bought on Addons'}</option>{/if}
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules'}</option>
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
<optgroup label="{l s='Authors'}">
{foreach from=$list_modules_authors key=module_author item=status}
<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
{/foreach}
</optgroup>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Others Modules'}</option>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
</select>
&nbsp;
<select name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Uninstalled'}</option>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Uninstalled Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Not Installed Modules'}</option>
</select>
&nbsp;
<select name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>

2
admin-dev/themes/default/template/controllers/modules/header.tpl
View File

@@ -53,7 +53,7 @@
<label style="width: 100px">{l s='Module file'}</label>
<div class="margin-form" style="padding-left: 140px">
<input type="file" name="file" />
<p>{l s='Upload the module from your computer.'}</p>
<p>{l s='Upload a module from your computer.'}</p>
</div>
<div class="margin-form" style="padding-left: 140px">
<input type="submit" name="download" value="{l s='Upload this module'}" class="button" />

4
admin-dev/themes/default/template/controllers/modules/list.tpl
View File

@@ -77,7 +77,7 @@
<td>
<ul id="list-action-button">
{if $module->id && isset($module->version_addons) && $module->version_addons}
<li><a href="{$module->options.update_url}" class="button updated"><span>{l s='Update it !'}</span></a></li>
<li><a href="{$module->options.update_url}" class="button updated"><span>{l s='Update it!'}</span></a></li>
{/if}
<li><a {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}" class="button installed"><span>{if isset($module->id) && $module->id gt 0}{l s='Uninstall'}{else}{l s='Install'}{/if}</span></a></li>
</ul>
@@ -92,6 +92,6 @@
<input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" />
</div>
{else}
<div style="margin-top: 12px;color: #585A69;font-size: 16px;"><p align="center">{l s='No modules available on this section.'}</p></div>
<div style="margin-top: 12px;color: #585A69;font-size: 16px;"><p align="center">{l s='No modules available in this section.'}</p></div>
{/if}

2
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
View File

@@ -96,7 +96,7 @@
{$value}
{/foreach}
{/if}
{l s='Please specify those files for which you do not want the module to be displayed'}.<br />
{l s='Please specify the files for which you do not want the module to be displayed'}.<br />
{l s='Please type each filename separated by a comma'}.
<br /><br />
</div>

10
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
View File

@@ -57,18 +57,18 @@
</select>
<br /><br />
<input type="checkbox" id="hook_position" onclick="autoUrlNoList('hook_position', '{$url_show_invisible}')" {if $hook_position}checked="checked"{/if} />&nbsp;
<label class="t" for="hook_position">{l s='Display non-positionable hook'}</label>
<label class="t" for="hook_position">{l s='Display non-positionable hooks'}</label>
</form>
</div>
<br/>
<div>
<div id="modulePosition">
<div class="blocLiveEdit"><h2>{l s='Live edit'}</h2>
<div class="blocLiveEdit"><h2>{l s='LiveEdit'}</h2>
{if $live_edit}
<p>{l s='You have to select a shop to use live edit'}</p>
<p>{l s='You have to select a shop to use LiveEdit'}</p>
{else}
<p>{l s='By clicking here you will be redirected to the front office of your shop to move and delete modules directly.'}</p>
<p>{l s='Click here to be redirected to the Front Office of your shop where you can move and delete modules directly.'}</p>
<a href="{$url_live_edit}" target="_blank" class="button">{l s='Run LiveEdit'}</a>
{/if}
</div>
@@ -77,7 +77,7 @@
<input class="button floatr" type="submit" name="unhookform" value="{l s='Unhook the selection'}"/></div>
{if !$can_move}
<br /><div><b>{l s='If you want to order / move following data, please go in shop context (select a shop in shop list)'}</b></div>
<br /><div><b>{l s='If you want to order/move the following data, please select a shop from the shop list'}</b></div>
{/if}
{foreach $hooks as $hook}
<a name="{$hook['name']}"/>

2
admin-dev/themes/default/template/controllers/not_found/content.tpl
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'} {$controller} {l s='is missing or invalid.'}</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>

4
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
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>

4
admin-dev/themes/default/template/controllers/orders/form.tpl
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>

26
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
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>

8
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
View File

@@ -28,7 +28,7 @@
{block name="label"}
{if $input.type == 'text' && $input.name == 'ps_cache_fs_directory_depth'}
<div id="directory_depth">
<div class="warn">{l s='The system CacheFS should be used only when the infrastructure contain only one front-end server. Ask your hosting company if you don\'t know.'}</div>
<div class="warn">{l s='The CacheFS system should be used only when the infrastructure contains only one front-end server. If you are not sure, ask your hosting company.'}</div>
{else}
{$smarty.block.parent}
{/if}
@@ -37,7 +37,7 @@
{block name="input"}
{if $input.type == 'radio' && $input.name == 'combination' && $input.disabled}
<div class="warn">
{l s='This feature can\'t be disabled because this is currently in use.'}
{l s='This feature cannot be disabled because it is currently in use.'}
</div>
{/if}
{$smarty.block.parent}
@@ -96,8 +96,8 @@
<div class="margin-form">
<table style="width: 320px;" cellspacing="0" cellpadding="0" class="table">
<tr>
<th style="width: 20px; text-align: center">{l s='Id'}</th>
<th style="width: 200px; text-align: center">{l s='Ip'}</th>
<th style="width: 20px; text-align: center">{l s='ID'}</th>
<th style="width: 200px; text-align: center">{l s='IP address'}</th>
<th style="width: 50px; text-align: center">{l s='Port'}</th>
<th style="width: 30px; text-align: right; font-weight: bold;">{l s='Weight'}</th>
<th style="width: 20px; text-align: right;">&nbsp;</th>

6
admin-dev/themes/default/template/controllers/products/associations.tpl
View File

@@ -28,7 +28,7 @@
<h4>{l s='Associations'}</h4>
<div class="separation"></div>
<div id="no_default_category" class="hint">
{l s='Please check a category in order to select the default category.'}
{l s='Please select a default category.'}
</div>
<table>
<tr>
@@ -61,7 +61,7 @@
<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
{/foreach}
</select>
<div class="hint" style="display:block;">{l s='The default category is the category who is displayed by default.'}</div>
<div class="hint" style="display:block;">{l s='The default category is the category which is displayed by default.'}</div>
</td>
</tr>
</table>
@@ -85,7 +85,7 @@
<input type="text" value="" id="product_autocomplete_input" />
{l s='Begin typing the first letters of the product name, then select the product from the drop-down list'}
</p>
<p class="preference_description">{l s='(Do not forget to Save the product afterward)'}</p>
<p class="preference_description">{l s='(Do not forget to save the product afterward)'}</p>
<!--<img onclick="$(this).prev().search();" style="cursor: pointer;" src="../img/admin/add.gif" alt="{l s='Add an accessory'}" title="{l s='Add an accessory'}" />-->
</div>
<div id="divAccessories">

4
admin-dev/themes/default/template/controllers/products/attachments.tpl
View File

@@ -52,11 +52,11 @@
<label>{l s='File'}</label>
<div class="margin-form">
<p><input type="file" name="attachment_file" /></p>
<p class="preference_description">{l s='Upload file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE} {l s='Mo maximum'})</p>
<p class="preference_description">{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE} {l s='MB maximum'})</p>
</div>
<div class="clear">&nbsp;</div>
<div class="margin-form">
<input type="submit" value="{l s='Download a attachment file'}" name="submitAddAttachments" class="button" />
<input type="submit" value="{l s='Download an attachment file'}" name="submitAddAttachments" class="button" />
</div>
<div class="small"><sup>*</sup> {l s='Required field'}</div>
</fieldset>

10
admin-dev/themes/default/template/controllers/products/combinations.tpl
View File

@@ -139,7 +139,7 @@
<p class="block">
<label for="virtual_product_name_attribute" class="t">{l s='Filename'}</label>
<input id="virtual_product_name_attribute" name="virtual_product_name_attribute" style="width:200px" value="" type="text">
<span class="hint" name="help_box" style="display:none;">{l s='The full filename with its extension (e.g., Book.pdf)'}</span>
<span class="hint" name="help_box" style="display:none;">{l s='The full filename with its extension (e.g. Book.pdf)'}</span>
</p>
</div>
<div id="virtual_good_more_attribute" style="padding:5px;width:40%;float:left;margin-left:10px">
@@ -151,12 +151,12 @@
<p class="block">
<label for="virtual_product_expiration_date_attribute" class="t">{l s='Expiration date'}</label>
<input class="datepicker" type="text" id="virtual_product_expiration_date_attribute" name="virtual_product_expiration_date_attribute" value="" size="11" maxlength="10" autocomplete="off" /> {l s='Format: YYYY-MM-DD'}
<span class="hint" name="help_box" style="display:none">{l s='No expiration date if you leave this blank'}</span>
<span class="hint" name="help_box" style="display:none">{l s='Leave this blank for no expiration date'}</span>
</p>
<p class="block">
<label for="virtual_product_nb_days" class="t">{l s='Number of days'}</label>
<input type="text" id="virtual_product_nb_days_attribute" name="virtual_product_nb_days_attribute" value="" class="" size="4" /><sup> *</sup>
<span class="hint" name="help_box" style="display:none">{l s='How many days this file can be accessed by customers'} - <em>({l s='set to zero for unlimited access'} ) </em></span>
<span class="hint" name="help_box" style="display:none">{l s='How many days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access'} ) </em></span>
</p>
<p class="block">
<label for="virtual_product_is_shareable_attribute" class="t">{l s='is shareable'}</label>
@@ -181,7 +181,7 @@
{if $currency->format % 2 != 0}{$currency->sign}{/if}
<input type="text" size="6" name="attribute_wholesale_price" id="attribute_wholesale_price" value="" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
{if $currency->format % 2 == 0} {$currency->sign} {/if}<span id="attribute_wholesale_price_blank">({l s='leave blank if the price does not change'})</span>
<span style="display:none" id="attribute_wholesale_price_full">({l s='overrides Wholesale price on Information tab'})</span>
<span style="display:none" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on \\"Information\\" tab'})</span>
</td>
</tr>
<tr>
@@ -244,7 +244,7 @@
<td style="padding-bottom:5px;">{if $currency->format % 2 != 0}{$currency->sign}{/if}
<input type="text" size="3" name="attribute_ecotax" id="attribute_ecotax" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
{if $currency->format % 2 == 0} {$currency->sign}{/if}
({l s='overrides Eco-tax on Information tab'})
({l s='overrides Eco-tax on \\"Information\\" tab'})
</td>
</tr>
{/if}

2
admin-dev/themes/default/template/controllers/products/features.tpl
View File

@@ -30,7 +30,7 @@
<div class="separation"></div>
<ul>
<li>{l s='You can specify a value for each relevant feature regarding this product, empty fields will not be displayed.'}</li>
<li>{l s='You can either set a specific value, or select among existing pre-defined values you added previously.'}</li>
<li>{l s='You can either create a specific value or select among existing pre-defined values you added previously.'}</li>
</ul>
</td>
</tr>

8
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
View File

@@ -53,7 +53,7 @@
count = stripHTML(textarea_value).length;
rest = max - count;
if (rest < 0)
textarea.parent('div').find('span.counter').html('<span style="color:red;">{l s='Maximum'} '+max+' {l s=' characters'} : '+rest+'</span>');
textarea.parent('div').find('span.counter').html('<span style="color:red;">{l s='Maximum'} '+max+' {l s='characters'} : '+rest+'</span>');
else
textarea.parent('div').find('span.counter').html(' ');
}
@@ -88,7 +88,7 @@
var toload = new Array();
var empty_pack_msg = '{l s='Pack is empty. You need to add at least one product to the pack before you can save the pack.' slashes=1}';
var empty_name_msg = '{l s='Product name is empty. You need to enter a name at least for the default language before you can save the product.' slashes=1}';
var empty_link_rewrite_msg = '{l s='Friendly URL is empty. You need to enter a friendly url at least for the default language before you can save the product.' slashes=1}';
var empty_link_rewrite_msg = '{l s='Friendly URL is empty. You need to enter a friendly URL at least for the default language before you can save the product.' slashes=1}';
$('#product-tab-content-wait').show();
var post_data = {$post_data};
@@ -284,7 +284,7 @@
ThickboxI18nImage = "{l s='Image'}";
ThickboxI18nOf = "{l s='of'}";
ThickboxI18nClose = "{l s='Close'}";
ThickboxI18nOrEscKey = "{l s='(or "Esc")'}";
ThickboxI18nOrEscKey = "{l s='(or \\"Esc\\")'}";
ThickboxI18nNext = "{l s='Next >'}";
ThickboxI18nPrev = "{l s='< Previous'}";
tb_pathToImage = "../img/loadingAnimation.gif";
@@ -300,7 +300,7 @@
<div class="warn draft" >
<p>
<span style="float: left">
{l s='Your product will be saved as draft'}</span>
{l s='Your product will be saved as a draft'}</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview'}</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
<br />

2
admin-dev/themes/default/template/controllers/products/images.tpl
View File

@@ -40,7 +40,7 @@
<div id="progressBarImage" class="progressBarImage"></div>
<div id="showCounter" style="display:none;"><span id="imageUpload">0</span><span id="imageTotal">0</span></div>
<p class="preference_description" style="clear: both;">
{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"}{l s='Kb max.'}
{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"}{l s='kB max.'}
</p>
</td>
</tr>

4
admin-dev/themes/default/template/controllers/products/informations.tpl
View File

@@ -242,7 +242,7 @@
<td class="col-left"><label>{l s='Image tag to insert:'}</label></td>
<td style="padding-bottom:5px;">
<input type="text" id="resultImage" name="resultImage" />
<p class="preference_description">{l s='The tag is to copy / paste in the description.'}</p>
<p class="preference_description">{l s='The tag is to copy/paste in the description.'}</p>
</td>
</tr>
<tr>
@@ -294,7 +294,7 @@
<span class="hint" name="help_box">{l s='Forbidden characters:'} !&lt;;&gt;;?=+#&quot;&deg;{}_$%<span class="hint-pointer">&nbsp;</span></span>
</div>
{/foreach}
<p class="preference_description clear">{l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}</p>
<p class="preference_description clear">{l s='Tags separated by commas (e.g. dvd, dvd player, hifi)'}</p>
</td>
</tr>
</table>

6
admin-dev/themes/default/template/controllers/products/pack.tpl
View File

@@ -26,8 +26,8 @@
<script type="text/javascript">
var msg_select_one = '{l s='Thanks to select at least one product.' js=1}';
var msg_set_quantity = '{l s='Thanks to set a quantity to add a product.' js=1}';
var msg_select_one = '{l s='Please select at least one product.' js=1}';
var msg_set_quantity = '{l s='Please set a quantity to add a product.' js=1}';
$(document).ready(function() {
if ($('#ppack').attr('checked'))
@@ -184,7 +184,7 @@
<input type="hidden" size="2" id="curPackItemId" />
<span onclick="addPackItem();" class="button" style="cursor: pointer;">
{l s='Add this product in the pack'}
{l s='Add this product to the pack'}
</span>
<p class="product_description listOfPack" style="display:{if count($product->packItems) > 0}block{else}none{/if};text-align: left;">

12
admin-dev/themes/default/template/controllers/products/prices.tpl
View File

@@ -194,13 +194,13 @@ jQuery(document).ready(Customer.init);
{l s='/'} <span id="unity_second">{$product->unity}</span> {l s='with tax'}
</span>
{/if}
<p>{l s='Eg. $15 per Lb'}</p>
<p>{l s='e.g. per lb'}</p>
</td>
</tr>
<tr>
<td class="col-left"><label>&nbsp;</label></td>
<td>
<input type="checkbox" name="on_sale" id="on_sale" style="padding-top: 5px;" {if $product->on_sale}checked="checked"{/if} value="1" />&nbsp;<label for="on_sale" class="t">{l s='Display "on sale" icon on product page and text on product listing'}</label>
<input type="checkbox" name="on_sale" id="on_sale" style="padding-top: 5px;" {if $product->on_sale}checked="checked"{/if} value="1" />&nbsp;<label for="on_sale" class="t">{l s='Display \\"on sale\\" icon on product page and text on product listing'}</label>
</td>
</tr>
<tr>
@@ -223,7 +223,7 @@ jQuery(document).ready(Customer.init);
{if isset($specificPriceModificationForm)}
<h4>{l s='Specific prices'}</h4>
<div class="hint" style="display:block;min-height:0;">
{l s='You can set specific prices for clients belonging to different groups, different countries...'}
{l s='You can set specific prices for clients belonging to different groups, different countries, etc.'}
</div>
<br />
<a class="button bt-icon" href="#" id="show_specific_price"><img src="../img/admin/add.gif" alt="" /><span>{l s='Add a new specific price'}</span></a>
@@ -348,7 +348,7 @@ jQuery(document).ready(Customer.init);
)
</span>
<div class="hint" style="display:block;min-height:0;">
{l s='You can set this value at 0 in order to apply the default price'}
{l s='You can set this value to 0 in order to apply the default price'}
</div>
</div>
@@ -360,7 +360,7 @@ jQuery(document).ready(Customer.init);
<option value="amount">{l s='Amount'}</option>
<option value="percentage">{l s='Percentage'}</option>
</select>
{l s='(if set to "amount", the tax is included)'}
{l s='(if set to \\"amount\\", tax is included)'}
</div>
</div>
@@ -374,7 +374,7 @@ jQuery(document).ready(Customer.init);
<th class="cell border" style="width: 11%;">{l s='Country'}</th>
<th class="cell border" style="width: 13%;">{l s='Group'}</th>
<th class="cell border" style="width: 13%;">{l s='Customer'}</th>
<th class="cell border" style="width: 12%;">{l s='Price'} {if $country_display_tax_label}{l s='(tax excl)'}{/if}</th>
<th class="cell border" style="width: 12%;">{l s='Price'} {if $country_display_tax_label}{l s='(tax excl.)'}{/if}</th>
<th class="cell border" style="width: 10%;">{l s='Reduction'}</th>
<th class="cell border" style="width: 15%;">{l s='Period'}</th>
<th class="cell border" style="width: 10%;">{l s='From (quantity)'}</th>

14
admin-dev/themes/default/template/controllers/products/quantities.tpl
View File

@@ -30,11 +30,11 @@
<div class="separation"></div>
<div class="hint" style="display:block; position:'auto';">
<p>{l s='This interface allows you to manage the available quantities for sale of the current product and its combinations on the current shop.'}</p>
<p>{l s='You can choose to use the advanced stock management system for this product or not.'}</p>
<p>{l s='You can manually specify the quantities for the product / each product combinations, or choose to automatically determine these quantities based on your stock (if advanced stock management is activated).'}</p>
<p>{l s='You can choose whether or not to use the advanced stock management system for this product.'}</p>
<p>{l s='You can manually specify the quantities for the product/each product combination, or choose to automatically determine these quantities based on your stock (if advanced stock management is activated).'}</p>
<p>{l s='In this case, the quantities correspond to the quantitites of the real stock in the warehouses associated to the current shop or current group of shops.'}</p>
<br/>
<p>{l s='For packs, if it has products that use the advanced stock management, you have to specify a common warehouse for these products and the pack.'}</p>
<p>{l s='For packs, if it has products that use the advanced stock management, you have to specify a common warehouse for these products in the pack.'}</p>
<p>{l s='Also, please note that when a product has combinations, its default combination will be used in stock movements.'}</p>
</div>
<br />
@@ -64,7 +64,7 @@
<label style="float:none;font-weight:normal" for="advanced_stock_management">
{l s='I want to use the advanced stock management system for this product'}
{if $stock_management_active == 0 && !$product->cache_is_pack}
&nbsp;-&nbsp;<b>{l s='This requires to enable the advanced stock management.'}</b>
&nbsp;-&nbsp;<b>{l s='This requires you to enable advanced stock management.'}</b>
{else if $product->cache_is_pack}
&nbsp;-&nbsp;<b>{l s='This parameter depends on the product(s) in the pack.'}</b>
{/if}
@@ -85,7 +85,7 @@
<label style="float:none;font-weight:normal" for="depends_on_stock_1">
{l s='Available quantities for current product and its combinations are based on stock in the warehouses'}
{if ($stock_management_active == 0 || $product->advanced_stock_management == 0) && !$product->cache_is_pack}
&nbsp;-&nbsp;<b>{l s='This requires to enable the advanced stock management globaly/for this product.'}</b>
&nbsp;-&nbsp;<b>{l s='This requires you to enable the advanced stock management globally or for this product.'}</b>
{else if $product->cache_is_pack}
&nbsp;-&nbsp;<b>{l s='This parameter depends on the product(s) in the pack.'}</b>
{/if}
@@ -111,7 +111,7 @@
<tr>
<td valign="top" style="text-align:left;vertical-align:top;">
<p><b>{l s='When a product has combinations, quantities will be based on the default combination.'}</b></p>
<p><b>{l s='Given the quantities of the products in this pack, the maximum quantity should be: '} {$pack_quantity}</b></p>
<p><b>{l s='Given the quantities of the products in this pack, the maximum quantity should be:'} {$pack_quantity}</b></p>
</td>
</tr>
{/if}
@@ -183,7 +183,7 @@
</table>
{else}
<div class="warn">
<p>{l s='It is not possible to manage quantities when : '}</p>
<p>{l s='It is not possible to manage quantities when:'}</p>
<ul>
<li>{l s='You are managing all shops.'}</li>
<li>{l s='You are managing a group of shops where quantities are not shared between all shops of this group.'}</li>

4
admin-dev/themes/default/template/controllers/products/seo.tpl
View File

@@ -61,7 +61,7 @@
{include file="controllers/products/input_text_lang.tpl" languages=$languages
input_value=$product->meta_keywords
input_name='meta_keywords'}
<p class="preference_description">{l s='Keywords for HTML header, separated by a comma'}</p>
<p class="preference_description">{l s='Keywords for HTML header, separated by commas'}</p>
</td>
</tr>
<tr>
@@ -77,7 +77,7 @@
<p class="clear" style="padding:10px 0 0 0">
<a style="cursor:pointer" class="button"
onmousedown="updateFriendlyURLByName();">{l s='Generate'}</a>&nbsp;
{l s='Friendly-url from product\'s name.'}<br /><br />
{l s='Friendly URL from product name.'}<br /><br />
{l s='Product link will look like this:'}
{if $ps_ssl_enabled}https://{else}http://{/if}{$smarty.server.SERVER_NAME}{$smarty.const.__PS_BASE_URI__}{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html</p>
</td>

8
admin-dev/themes/default/template/controllers/products/shipping.tpl
View File

@@ -31,25 +31,25 @@
<table>
<tr>
<td class="col-left"><label>{l s='Width ( package ) :'}</label></td>
<td class="col-left"><label>{l s='Width (package):'}</label></td>
<td style="padding-bottom:5px;">
<input size="6" maxlength="6" name="width" type="text" value="{$product->width}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" /> {$ps_dimension_unit}
</td>
</tr>
<tr>
<td class="col-left"><label>{l s='Height ( package ) :'}</label></td>
<td class="col-left"><label>{l s='Height (package):'}</label></td>
<td style="padding-bottom:5px;">
<input size="6" maxlength="6" name="height" type="text" value="{$product->height}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" /> {$ps_dimension_unit}
</td>
</tr>
<tr>
<td class="col-left"><label>{l s='Depth ( package ) :'}</label></td>
<td class="col-left"><label>{l s='Depth (package):'}</label></td>
<td style="padding-bottom:5px;">
<input size="6" maxlength="6" name="depth" type="text" value="{$product->depth}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" /> {$ps_dimension_unit}
</td>
</tr>
<tr>
<td class="col-left"><label>{l s='Weight ( package ) :'}</label></td>
<td class="col-left"><label>{l s='Weight (package):'}</label></td>
<td style="padding-bottom:5px;">
<input size="6" maxlength="6" name="weight" type="text" value="{$product->weight}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" /> {$ps_weight_unit}
</td>

4
admin-dev/themes/default/template/controllers/products/suppliers.tpl
View File

@@ -35,7 +35,7 @@
<br />
<p>{l s='When using the advanced stock management (see Preferences/Products), the values you fill here (prices, references) will be used in the supply orders.'}</p>
</div>
<p>{l s='Please choose the suppliers associated to this product, and the default one.'}</p>
<p>{l s='Please choose the suppliers associated with this product, and the default one.'}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')}&addsupplier">
<img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /><span>{l s='Create new supplier'}</span>
</a>
@@ -73,7 +73,7 @@
{else}
<p>{l s='You can specify product reference(s) for each supplier associated.'}</p>
{/if}
<p>{l s='Click "Save and Stay" after changing selected suppliers to display the associated product references.'}</p>
<p>{l s='Click \\"Save and Stay\\" after changing selected suppliers to display the associated product references.'}</p>
<div id="suppliers_accordion" style="margin-top:10px; display:block;">
{foreach from=$associated_suppliers item=supplier}
<h3 style="margin-bottom:0;"><a href="#">{$supplier->name}</a></h3>

12
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
View File

@@ -158,7 +158,7 @@
<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
<table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #CCCCCC;">
<tr><td>
<br/>{l s='Does this product has an associated file ?'}<br />
<br/>{l s='Does this product has an associated file?'}<br />
<label style="width:50px"><input type="radio" value="1" id="virtual_good_file_1" name="is_virtual_file" {if $product_downloaded}checked="checked"{/if} />{l s='Yes'}</label>
<label style="width:50px"><input type="radio" value="0" id="virtual_good_file_2" name="is_virtual_file" {if !$product_downloaded}checked="checked"{/if} />{l s='No'}</label><br /><br />
{if $download_product_file_missing}
@@ -184,7 +184,7 @@
<p class="block">
{if !$product->productDownload->checkFile()}
<div style="padding:5px;width:50%;float:left;margin-right:20px;border-right:1px solid #CCCCCC">
<p>{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize} {l s='Mo'}</p>
<p>{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p>
{if $show_file_input}
<label id="virtual_product_file_label" for="virtual_product_file" class="t">{l s='Upload a file'}</label>
<p><input type="file" id="virtual_product_file" name="virtual_product_file" onchange="uploadFile();" maxlength="{$upload_max_filesize}" /></p>
@@ -211,7 +211,7 @@
<p class="block">
<label for="virtual_product_name" class="t">{l s='Filename'}</label>
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|htmlentities}" />
<span class="hint" name="help_box" style="display:none;">{l s='The full filename with its extension (e.g., Book.pdf)'}</span>
<span class="hint" name="help_box" style="display:none;">{l s='The full filename with its extension (e.g. Book.pdf)'}</span>
</p>
</div>
</td></tr>
@@ -227,12 +227,12 @@
<p class="block">
<label for="virtual_product_expiration_date" class="t">{l s='Expiration date'}</label>
<input class="datepicker" type="text" id="virtual_product_expiration_date" name="virtual_product_expiration_date" value="{$product->productDownload->date_expiration}" size="11" maxlength="10" autocomplete="off" /> {l s='Format: YYYY-MM-DD'}
<span class="hint" name="help_box" style="display:none">{l s='No expiration date if you leave this blank'}</span>
<span class="hint" name="help_box" style="display:none">{l s='Leave this blank for no expiration date'}</span>
</p>
<p class="block">
<label for="virtual_product_nb_days" class="t">{l s='Number of days'}</label>
<input type="text" id="virtual_product_nb_days" name="virtual_product_nb_days" value="{$product->productDownload->nb_days_accessible|htmlentities}" class="" size="4" /><sup> *</sup>
<span class="hint" name="help_box" style="display:none">{l s='How many days this file can be accessed by customers'} - <em>({l s='set to zero for unlimited access'})</em></span>
<span class="hint" name="help_box" style="display:none">{l s='How many days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access'})</em></span>
</p>
<p class="block">
<label for="virtual_product_is_shareable" class="t">{l s='is shareable'}</label>
@@ -241,7 +241,7 @@
</p>
</div>
{else}
<div class="hint clear" style="display: block;width: 70%;">{l s='You used combinations, for this reason you can\'t edit your file here, but in the Combinations tab'}</div>
<div class="hint clear" style="display: block;width: 70%;">{l s='You cannot edit your file here because you used combinations. Please edit it in the Combinations tab'}</div>
<br />
{$error_product_download}
{/if}

6
admin-dev/themes/default/template/controllers/products/warehouses.tpl
View File

@@ -31,9 +31,9 @@
<div class="separation"></div>
<div class="hint" style="display:block; position:'auto';">
<p>{l s='This interface allows you to specify in which warehouses the product is stocked.'}</p>
<p>{l s='It is also possible to specify for each product/product combinations its location in each warehouse.'}</p>
<p>{l s='It is also possible to specify for each product/product combination its location in each warehouse.'}</p>
</div>
<p>{l s='Please choose the warehouses associated to this product, and the default one.'}</p>
<p>{l s='Please choose the warehouses associated with this product, and the default one.'}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminWarehouses')}&addwarehouse">
<img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /><span>{l s='Create new warehouse'}</span>
@@ -47,7 +47,7 @@
<tr>
<th width="100">{l s='Stored'}</th>
<th>{l s='Product'}</th>
<th width="150">{l s='Location (optionnal)'}</th>
<th width="150">{l s='Location (optional)'}</th>
</tr>
{foreach $attributes AS $index => $attribute}
{assign var=location value=''}

2
admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
View File

@@ -41,7 +41,7 @@
<input type="radio" name="tracking_dt" id="tracking_dt_off" value="0" {if !$tracking_dt}checked="checked"{/if}/>
<label class="t" for="tracking_dt_off"> {l s='No'}</label>
</div>
<p>{l s='Direct traffic can be quite consuming. You should consider enabling it only if you have a strong database server and a strong need for it.'}</p>
<p>{l s='Direct traffic can be quite resource-intensive. You should consider enabling it only if you have a strong database server and a strong need for it.'}</p>
<input type="submit" class="button" value="{l s=' Save '}" name="submitSettings" id="submitSettings" />
</form>
<div class="separation"></div>

18
admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
View File

@@ -37,37 +37,37 @@
<ul style="list-style: disc; margin-left: 20px;">
<li>
{l s='The field `http_referer` is the website from which your customers arrive.'}<br />
{l s='For example, visitors coming from Google will have a `http_referer` like this one: "http://www.google.com/search?q=prestashop".'}<br />
{l s='For example, visitors coming from Google will have a `http_referer` like this one: \\"http://www.google.com/search?q=prestashop\\".'}<br />
{l s='If the visitor arrives directly (by typing the URL of your shop or by using their bookmarks, for example), `http_referer` will be empty.'}<br />
{l s='So if you want all the visitors coming from google, you can type "%google%" in this field, or "%google.fr%" if you want the visitors coming from Google France only.'}<br />
{l s='So if you want all the visitors coming from google, you can type \\"%google%\\" in this field, or \\"%google.fr%\\" if you want the visitors coming from Google France only.'}<br />
</li>
<br />
<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. 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 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 />
<li>
{l s='The fields `include` indicate what has to be included in the URL.'}
{l s='The `include` fields indicate what has to be included in the URL.'}
</li>
<br />
<li>
{l s='The fields `exclude` indicate what has to be excluded from the URL.'}
{l s='The `exclude` fields indicate what has to be excluded from the URL.'}
</li>
<br />
<li>
{l s='When using the simple mode, you can use some generic characters which can replace any characters:'}
<ul>
<li>{l s='"_" will replace one character. If you want to use the real "_", you should type'} "\\_".</li>
<li>{l s='"%" will replace any number of characters. If you want to use the real "%", you should type'} "\\%".</li>
<li>{l s='\\"_\\" will replace one character. If you want to use the real \\"_\\", you should type'} "\\_".</li>
<li>{l s='\\"%\\" will replace any number of characters. If you want to use the real \\"%\\", you should type'} "\\%".</li>
</ul>
</li>
<br />
<li>
{l s='The simple mode uses the MySQL "LIKE", but for a higher potency you can use MySQL regular expressions.'}
<a href="http://dev.mysql.com/doc/refman/5.0/en/regexp.html" target="_blank" style="font-style: italic;">{l s='Take a look at the document for more details...'}</a>
{l s='The simple mode uses the MySQL \\"LIKE\\", but for a higher potency you can use MySQL regular expressions.'}
<a href="http://dev.mysql.com/doc/refman/5.0/en/regexp.html" target="_blank" style="font-style: italic;">{l s='Take a look at our documentation for more details...'}</a>
</li>
</ul>
</div>

2
admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
View File

@@ -91,7 +91,7 @@
var table = $('#selectTables select').val();
if (!table)
jAlert("{l s='Please, choose table.'}");
jAlert("{l s='Please choose table.'}");
else
AddRequestSql(table);
});

2
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
View File

@@ -90,7 +90,7 @@ $(function() {
{/if}
{if isset($customers)}
{if !$customers}
<h3>{l s='No customer matching your query'} : {$query}</h3>
<h3>{l s='No customers matching your query'} : {$query}</h3>
{else}
<h3>{l s='Customer matching your query'} : {$query}</h3>
{$customers}

2
admin-dev/themes/default/template/controllers/stats/calendar.tpl
View File

@@ -39,7 +39,7 @@
<p><span>{if isset($translations.To)}{$translations.To}{else}<span>{l s='From:'}</span>{/if}</span>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo}" class="datepicker">
</p>
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="button" value="{if isset($translations.Save)}{$translations.Save}{else}{l s=' Save '}{/if}" />
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="button" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}" />
</form>
<script type="text/javascript">

2
admin-dev/themes/default/template/controllers/stats/engines.tpl
View File

@@ -64,7 +64,7 @@
{/foreach}
</select>
</div>
<p><input type="submit" value="{l s=' Save '}" name="submitSettings" id="submitSettings" class="button" /></p>
<p><input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="button" /></p>
</form>
</div>

2
admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
View File

@@ -77,7 +77,7 @@
</tr>
<tr>
<td>&nbsp;</td>
<td style="font-size: 0.85em;">{l s='Sample: 10:00AM - 9:30PM'}</td>
<td style="font-size: 0.85em;">{l s='e.g. 10:00AM - 9:30PM'}</td>
</tr>
{foreach $fields_value.days as $k => $value}

4
admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
View File

@@ -61,7 +61,7 @@
<th style="width: 50px">{l s='UPC'}</th>
<th style="width: 150px">{l s='Supplier Reference'}</th>
<th>{l s='Name'}</th>
<th style="width: 100px">{l s='Unit Price TE'}</th>
<th style="width: 100px">{l s='Unit Price (tax excl.)'}</th>
<th style="width: 100px">{l s='Quantity'}</th>
<th style="width: 100px">{l s='Discount rate'}</th>
<th style="width: 100px">{l s='Tax rate'}</th>
@@ -139,7 +139,7 @@
// check if it's possible to add the product
if (product_infos == null || $('#cur_product_name').val() == '')
{
jAlert('{l s='Thanks to select at least one product.'}');
jAlert('{l s='Please select at least one product.'}');
return false;
}

8
admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
View File

@@ -28,7 +28,7 @@
{block name="override_tpl"}
<div style="margin-top: 20px;">
<fieldset>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General informations'}</legend>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'}</legend>
<table style="width: 400px;" classe="table">
<tr>
<td>{l s='Creation date:'}</td>
@@ -82,7 +82,7 @@
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total TE'}</td>
<td>{l s='Total (tax excl.)'}</td>
<td align="right">{$supply_order_total_te}</td>
</tr>
<tr>
@@ -90,7 +90,7 @@
<td align="right">{$supply_order_discount_value_te}</td>
</tr>
<tr>
<td>{l s='Total with discount TE'}</td>
<td>{l s='Total with discount (tax excl.)'}</td>
<td align="right">{$supply_order_total_with_discount_te}</td>
</tr>
<tr>
@@ -102,7 +102,7 @@
<td align="right">{$supply_order_total_tax}</td>
</tr>
<tr>
<td>{l s='Total TI'}</td>
<td>{l s='Total (tax incl.)'}</td>
<td align="right">{$supply_order_total_ti}</td>
</tr>
<tr>

2
admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
View File

@@ -50,7 +50,7 @@ $(document).ready(function() {
{/foreach}
</select>
<p class="preference_description">
{l s='Choose the new status of your order'}
{l s='Choose the new status for your order'}
</p>
</div>

4
admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
View File

@@ -37,7 +37,7 @@
<option value="{$product.id_product}">{$product.name}</option>
{/foreach}
</select>
<span class="hint" name="help_box">{l s='double click to move to other column'}<span class="hint-pointer">&nbsp;</span></span>
<span class="hint" name="help_box">{l s='Double-click to move to other column'}<span class="hint-pointer">&nbsp;</span></span>
<br /><br />
<a href="#" id="move_to_right" class="multiple_select_remove">
{l s='Remove'} &gt;&gt;
@@ -49,7 +49,7 @@
<option value="{$product.id_product}">{$product.name}</option>
{/foreach}
</select>
<span class="hint" name="help_box">{l s='double click to move to other column'}<span class="hint-pointer">&nbsp;</span></span>
<span class="hint" name="help_box">{l s='Double-click to move to other column'}<span class="hint-pointer">&nbsp;</span></span>
<br /><br />
<a href="#" id="move_to_left" class="multiple_select_add">
&lt;&lt; {l s='Add'}

16
admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
View File

@@ -37,7 +37,7 @@
<fieldset>
<legend><img src="../img/admin/translation.gif" />{l s='Modify translations'}</legend>
{l s='Here you can modify translations for all text input into PrestaShop.'}<br />
{l s='Here you can modify translations for all text input in PrestaShop.'}<br />
{l s='First, select a section (such as Back Office or Modules), then click the flag representing the language you want to edit.'}<br /><br />
<form method="get" action="index.php" id="typeTranslationForm">
<input type="hidden" name="tab" value="AdminTranslations" />
@@ -65,7 +65,7 @@
<div id="submitAddLangContent" style="float:left;">
<p>{l s='You can add or update a language directly from prestashop.com here'}</p>
<div class="warn">
{l s='If you choose to update an existing language pack, all your previous customization in the theme named prestashop will be lost. This includes front office expressions and default e-mail templates.'}
{l s='If you choose to update an existing language pack, all your previous customization in the theme named prestashop will be lost. This includes Front Office expressions and default e-mail templates.'}
</div>
{if $packs_to_update || $packs_to_install}
<div style="font-weight:bold; float:left;">{l s='Language you want to add or update:'}
@@ -81,10 +81,10 @@
{/foreach}
</optgroup>
</select> &nbsp;
<input type="submit" value="{l s='Add or update the language'}" name="submitAddLanguage" class="button" />
<input type="submit" value="{l s='Add or update a language'}" name="submitAddLanguage" class="button" />
</div>
{else}
<br /><br /><p class="error">{l s='Cannot connect to prestashop.com to get languages list.'}</p></div>
<br /><br /><p class="error">{l s='Cannot connect to prestashop.com to get language list.'}</p></div>
{/if}
</div>
</fieldset>
@@ -96,8 +96,8 @@
<img src="../img/admin/import.gif" />{l s='Import a language pack manually'}
</legend>
<div id="submitImportContent">
{l s='If the name format is: isocode.gzip (e.g. fr.gzip) and the language corresponding to this package does not exist, it will automatically be created.'}
{l s='Be careful, as it will replace all existing data for the destination language!'}<br /><br />
{l s='If the name format is: isocode.gzip (e.g. us.gzip) and the language corresponding to this package does not exist, it will automatically be created.'}
{l s='Be careful, as this will replace all existing data for the destination language!'}<br /><br />
{l s='Language pack to import:'} <input type="file" name="file" /> &nbsp;<input type="submit" value="{l s='Import'}" name="submitImport" class="button" /></p>
</div>
</fieldset>
@@ -128,7 +128,7 @@
<fieldset>
<legend><img src="../img/admin/copy_files.gif" />{l s='Copy'}</legend>
<p>{l s='Copies data from one language to another.'}<br />
{l s='Be careful, as it will replace all existing data for the destination language!'}<br />
{l s='Be careful, as this will replace all existing data for the destination language!'}<br />
{l s='If necessary'}, <b><a href="{$url_create_language}">{l s='first create a new language'}</a></b>.</p>
<div style="float:left;">
<p>
@@ -163,7 +163,7 @@
<div style="float:left;">
<input type="submit" value="{l s=' Copy '}" name="submitCopyLang" class="button" style="margin:25px 0px 0px 25px;" />
</div>
<p style="clear: left; padding: 16px 0px 0px 0px;"><span style="font-style: bold; color: red;">*</span> {l s='Language files (as indicated at Tools >> Languages >> Edition) must be complete to allow copying of translations'}</p>
<p style="clear: left; padding: 16px 0px 0px 0px;"><span style="font-style: bold; color: red;">*</span> {l s='Language files (as indicated at Tools > Languages > Edition) must be complete to allow copying of translations'}</p>
</fieldset>
</form>
{/block}

2
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
View File

@@ -37,7 +37,7 @@
<b>{$limit_warning['post.max_vars']}</b>{l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request limit to'}
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>

2
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
View File

@@ -39,7 +39,7 @@
<b>{$limit_warning['post.max_vars']}</b>{l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request limit to'}
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>

8
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
View File

@@ -38,7 +38,7 @@
<b>{$limit_warning['post.max_vars']}</b>{l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request limit to'}
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
@@ -58,18 +58,18 @@
<h2>{l s='Core e-mails:'}</h2>
{$mail_content}
<h2>{l s='Modules e-mails:'}</h2>
<h2>{l s='Module e-mails:'}</h2>
{foreach $module_mails as $module_name => $mails}
{$mails['display']}
{/foreach}
{if !empty($theme_mails)}
<h2>{l s='Themes e-mails:'}</h2>
<h2>{l s='Theme e-mails:'}</h2>
{$bool_title = false}
{foreach $theme_mails as $theme_or_module_name => $mails}
{if $theme_or_module_name != 'theme_mail' && !$bool_title}
{$bool_title = true}
<h2>{l s='E-mails modules in theme:'}</h2>
<h2>{l s='E-mail modules in theme:'}</h2>
{/if}
{$mails['display']}
{/foreach}

2
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
View File

@@ -37,7 +37,7 @@
<b>{$limit_warning['post.max_vars']}</b>{l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request limit to'}
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>

6
admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
View File

@@ -61,10 +61,10 @@
</tr>
<tr>
<td>{l s='Products:'}</td>
<td>{$warehouse_num_products} {l s='references'}</td>
<td>{$warehouse_num_products} {l s='References:'}</td>
</tr>
<tr>
<td>{l s='Products physical quantities:'}</td>
<td>{l s='Physical product quantities:'}</td>
<td>{$warehouse_quantities}</td>
</tr>
<tr>
@@ -77,7 +77,7 @@
<div style="margin-top: 30px">
<fieldset>
<legend><img src="/img/t/AdminShop.gif" alt="" /> {l s='Shops'}</legend>
{l s='The following are the shops associated to this warehouse.'}
{l s='The following are the shops associated with this warehouse.'}
<table style="width: 400px; margin-top:20px" classe="table">
<tr>
<th>{l s='ID'}</th>

2
admin-dev/themes/default/template/helpers/list/list_header.tpl
View File

@@ -102,7 +102,7 @@
<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
{/if}
{l s='Page '}<b>{$page}</b> / {$total_pages}
{l s='Page'}<b>{$page}</b> / {$total_pages}
{if $page < $total_pages}
<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>

4
admin-dev/themes/default/template/helpers/options/options.tpl
View File

@@ -191,7 +191,7 @@
</div>
{/if}
{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in this shop context'}</p>{/if}
{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in the context of this shop'}</p>{/if}
</div>
</div>
<div class="clear"></div>
@@ -201,7 +201,7 @@
{if isset($categoryData['submit'])}
<div class="margin-form">
<input type="submit"
value="{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s=' Save '}{/if}"
value="{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}"
name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}button{/if}"
id="{$table}_form_submit_btn"

2
admin-dev/themes/default/template/helpers/required_fields.tpl
View File

@@ -52,7 +52,7 @@
</tbody>
</table><br />
<center>
<input style="margin-left:15px;" class="button" type="submit" value="{l s=' Save '}" name="submitFields" />
<input style="margin-left:15px;" class="button" type="submit" value="{l s='Save'}" name="submitFields" />
</center>
</p>
</form>

14
classes/AddressFormat.php
View File

@@ -120,7 +120,7 @@ class AddressFormatCore extends ObjectModel
$isValide = false;
if (!class_exists($className))
$this->_errorFormatList[] = Tools::displayError('This class name doesn\'t exist').
$this->_errorFormatList[] = Tools::displayError('This class name does not exist.').
': '.$className;
else
{
@@ -138,7 +138,7 @@ class AddressFormatCore extends ObjectModel
}
if (!$isValide)
$this->_errorFormatList[] = Tools::displayError('This property doesn\'t exist in the class or is forbidden').
$this->_errorFormatList[] = Tools::displayError('This property does not exist in the class or is forbidden.').
': '.$className.': '.$fieldName;
unset($obj);
@@ -162,26 +162,26 @@ class AddressFormatCore extends ObjectModel
{
$totalNameUsed = count($associationName);
if ($totalNameUsed > 2)
$this->_errorFormatList[] = Tools::displayError('This assocation contains too much key name');
$this->_errorFormatList[] = Tools::displayError('This association has too many elements.');
else if ($totalNameUsed == 1)
{
$associationName[0] = strtolower($associationName[0]);
if (in_array($associationName[0], self::$forbiddenPropertyList) ||
!$this->_checkValidateClassField('Address', $associationName[0], false))
$this->_errorFormatList[] = Tools::displayError('This name isn\'t allowed').': '.
$this->_errorFormatList[] = Tools::displayError('This name is not allowed.').': '.
$associationName[0];
}
else if ($totalNameUsed == 2)
{
if (empty($associationName[0]) || empty($associationName[1]))
$this->_errorFormatList[] = Tools::displayError('Syntax error with this pattern').': '.$patternName;
$this->_errorFormatList[] = Tools::displayError('Syntax error with this pattern.').': '.$patternName;
else
{
$associationName[0] = ucfirst($associationName[0]);
$associationName[1] = strtolower($associationName[1]);
if (in_array($associationName[0], self::$forbiddenClassList))
$this->_errorFormatList[] = Tools::displayError('This name isn\'t allowed').': '.
$this->_errorFormatList[] = Tools::displayError('This name is not allowed.').': '.
$associationName[0];
else
{
@@ -222,7 +222,7 @@ class AddressFormatCore extends ObjectModel
$usedKeyList[] = $patternName;
}
else
$this->_errorFormatList[] = Tools::displayError('This key is used too many times (once allowed)').
$this->_errorFormatList[] = Tools::displayError('This key has already been used.').
': '.$patternName;
}
}

6
classes/AdminTab.php
View File

@@ -416,7 +416,7 @@ abstract class AdminTabCore
{
if (!$adminTab->viewAccess())
{
echo Tools::displayError('Access denied');
echo Tools::displayError('Access denied.');
return false;
}
if (!count($actions))
@@ -865,7 +865,7 @@ abstract class AdminTabCore
if (isset($value[0]) && !empty($value[0]))
{
if (!Validate::isDate($value[0]))
$this->_errors[] = Tools::displayError('\'from:\' date format is invalid (YYYY-MM-DD)');
$this->_errors[] = Tools::displayError('\'From:\' date format is invalid (YYYY-MM-DD)');
else
$sqlFilter .= ' AND '.$key.' >= \''.pSQL(Tools::dateFrom($value[0])).'\'';
}
@@ -873,7 +873,7 @@ abstract class AdminTabCore
if (isset($value[1]) && !empty($value[1]))
{
if (!Validate::isDate($value[1]))
$this->_errors[] = Tools::displayError('\'to:\' date format is invalid (YYYY-MM-DD)');
$this->_errors[] = Tools::displayError('\'To:\' date format is invalid (YYYY-MM-DD)');
else
$sqlFilter .= ' AND '.$key.' <= \''.pSQL(Tools::dateTo($value[1])).'\'';
}

2
classes/Backup.php
View File

@@ -103,7 +103,7 @@ class BackupCore
$backupdir = realpath(_PS_ADMIN_DIR_.self::$backupDir);
if ($backupdir === false)
die(Tools::displayError('Backups directory does not exist.'));
die(Tools::displayError('\\"Backup\\" directory does not exist.'));
// Check the realpath so we can validate the backup file is under the backup directory
if (!empty($filename))

2
classes/Cart.php
View File

@@ -2318,7 +2318,7 @@ class CartCore extends ObjectModel
$carrier = self::$_carriers[$id_carrier];
if (!Validate::isLoadedObject($carrier))
die(Tools::displayError('Fatal error: "no default carrier"'));
die(Tools::displayError('Fatal error: \\"no default carrier\\"'));
if (!$carrier->active)
return $shipping_cost;

4
classes/CartRule.php
View File

@@ -340,7 +340,7 @@ class CartRuleCore extends ObjectModel
if (!$this->active)
return Tools::displayError('This voucher is disabled');
if (!$this->quantity)
return Tools::displayError('This voucher has already been used ');
return Tools::displayError('This voucher has already been used');
if (strtotime($this->date_from) > time())
return Tools::displayError('This voucher is not valid yet');
if (strtotime($this->date_to) < time())
@@ -496,7 +496,7 @@ class CartRuleCore extends ObjectModel
}
if ($cartTotal < $minimum_amount)
return Tools::displayError('You do not reach the minimum amount required to use this voucher');
return Tools::displayError('You have not reached the minimum amount required to use this voucher');
}
}

8
classes/FileUploader.php
View File

@@ -78,10 +78,10 @@ class FileUploaderCore
$pathinfo = pathinfo($this->file->getName());
$these = implode(', ', $this->allowedExtensions);
if (!isset($pathinfo['extension']))
return array('error' => Tools::displayError('File has an invalid extension, it should be one of ').$these.'.');
return array('error' => Tools::displayError('File has an invalid extension, it should be one of').$these.'.');
$ext = $pathinfo['extension'];
if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions))
return array('error' => Tools::displayError('File has an invalid extension, it should be one of ').$these.'.');
return array('error' => Tools::displayError('File has an invalid extension, it should be one of').$these.'.');
return $this->file->save();
@@ -98,7 +98,7 @@ class QqUploadedFileForm
{
$product = new Product($_GET['id_product']);
if (!Validate::isLoadedObject($product))
return array('error' => Tools::displayError('Cannot add image because product add failed.'));
return array('error' => Tools::displayError('Cannot add image because product creation failed.'));
else
{
$image = new Image();
@@ -182,7 +182,7 @@ class QqUploadedFileXhr
{
$product = new Product($_GET['id_product']);
if (!Validate::isLoadedObject($product))
return array('error' => Tools::displayError('Cannot add image because product add failed.'));
return array('error' => Tools::displayError('Cannot add image because product creation failed.'));
else
{
$image = new Image();

4
classes/ImageManager.php
View File

@@ -216,11 +216,11 @@ class ImageManagerCore
public static function validateUpload($file, $max_file_size = 0)
{
if ((int)$max_file_size > 0 && $file['size'] > (int)$max_file_size)
return Tools::displayError('Image is too large').' ('.($file['size'] / 1000).Tools::displayError('KB').'). '.Tools::displayError('Maximum allowed:').' '.($max_file_size / 1000).Tools::displayError('KB');
return Tools::displayError('Image is too large').' ('.($file['size'] / 1000).Tools::displayError('kB').'). '.Tools::displayError('Maximum allowed:').' '.($max_file_size / 1000).Tools::displayError('kB');
if (!ImageManager::isRealImage($file['tmp_name'], $file['type']))
return Tools::displayError('Image format not recognized, allowed formats are: .gif, .jpg, .png');
if ($file['error'])
return Tools::displayError('Error while uploading image; please change your server\'s settings.').'('.Tools::displayError('Error code: ').$file['error'].')';
return Tools::displayError('Error while uploading image; please change your server\'s settings.').'('.Tools::displayError('Error code:').$file['error'].')';
return false;
}

2
classes/ImportModule.php
View File

@@ -43,7 +43,7 @@ abstract class ImportModuleCore extends Module
if (!mysql_select_db($this->database, $this->_link))
die(Tools::displayError('The database selection cannot be made.'));
if (!mysql_query('SET NAMES \'utf8\'', $this->_link))
die(Tools::displayError('PrestaShop Fatal error: no utf-8 support. Please check your server configuration.'));
die(Tools::displayError('Fatal error: no UTF-8 support. Please check your server configuration.'));
}
else
die(Tools::displayError('Link to database cannot be established.'));

14
classes/LocalizationPack.php
View File

@@ -339,7 +339,7 @@ class LocalizationPackCore
if (!$gz->extract(_PS_TRANSLATIONS_DIR_.'../', false))
{
$this->_errors[] = Tools::displayError('Cannot decompress the translation file of the language: ').(string)$attributes['iso_code'];
$this->_errors[] = Tools::displayError('Cannot decompress the translation file for the following language: ').(string)$attributes['iso_code'];
return false;
}
@@ -378,7 +378,7 @@ class LocalizationPackCore
$attributes = $data->attributes();
if (!isset($varNames[strval($attributes['type'])]))
{
$this->_errors[] = Tools::displayError('Pack corrupted: wrong unit type.');
$this->_errors[] = Tools::displayError('Localization pack corrupted: wrong unit type.');
return false;
}
if (!Configuration::updateValue($varNames[strval($attributes['type'])], strval($attributes['value'])))
@@ -410,17 +410,17 @@ class LocalizationPackCore
{
if (!Module::isInstalled($name))
if (!$module->install())
$this->_errors[] = Tools::displayError('An error has occured during the module installation: ').$name;
$this->_errors[] = Tools::displayError('An error occurred while installing the module:').$name;
}
else
if (Module::isInstalled($name))
if (!$module->uninstall())
$this->_errors[] = Tools::displayError('An error has occured during the module uninstall: ').$name;
$this->_errors[] = Tools::displayError('An error occurred while uninstalling the module:').$name;
unset($module);
}
else
$this->_errors[] = Tools::displayError('An error has occured, this module doesnt exists: ').$name;
$this->_errors[] = Tools::displayError('An error has occurred, this module does not exist:').$name;
}
return true;
@@ -457,10 +457,10 @@ class LocalizationPackCore
$group = new Group((int)_PS_DEFAULT_CUSTOMER_GROUP_);
$group->price_display_method = (int)$attributes['price_display_method'];
if (!$group->save())
$this->_errors[] = Tools::displayError('An error has occured during the default group update');
$this->_errors[] = Tools::displayError('An error has occurred during the default group update');
}
else
$this->_errors[] = Tools::displayError('An error has occured during the default group update');
$this->_errors[] = Tools::displayError('An error has occurred during the default group update');
}
return true;

16
classes/Mail.php
View File

@@ -60,23 +60,23 @@ class MailCore
if (!empty($from) && !Validate::isEmail($from))
{
Tools::dieOrLog(Tools::displayError('Error: parameter "from" is corrupted'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter \\"from\\" is corrupted'), $die);
return false;
}
if (!empty($fromName) && !Validate::isMailName($fromName))
{
Tools::dieOrLog(Tools::displayError('Error: parameter "fromName" is corrupted'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter \\"fromName\\" is corrupted'), $die);
return false;
}
if (!is_array($to) && !Validate::isEmail($to))
{
Tools::dieOrLog(Tools::displayError('Error: parameter "to" is corrupted'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter \\"to\\" is corrupted'), $die);
return false;
}
if (!is_array($templateVars))
{
Tools::dieOrLog(Tools::displayError('Error: parameter "templateVars" is not an array'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter \\"templateVars\\" is not an array'), $die);
return false;
}
@@ -89,13 +89,13 @@ class MailCore
if (!Validate::isTplName($template))
{
Tools::dieOrLog(Tools::displayError('Error: invalid email template'), $die);
Tools::dieOrLog(Tools::displayError('Error: invalid e-mail template'), $die);
return false;
}
if (!Validate::isMailSubject($subject))
{
Tools::dieOrLog(Tools::displayError('Error: invalid email subject'), $die);
Tools::dieOrLog(Tools::displayError('Error: invalid e-mail subject'), $die);
return false;
}
@@ -109,7 +109,7 @@ class MailCore
$addr = trim($addr);
if (!Validate::isEmail($addr))
{
Tools::dieOrLog(Tools::displayError('Error: invalid email address'), $die);
Tools::dieOrLog(Tools::displayError('Error: invalid e-mail address'), $die);
return false;
}
if (is_array($toName))
@@ -179,7 +179,7 @@ class MailCore
}
else if (!file_exists($templatePath.$template.'.txt') || !file_exists($templatePath.$template.'.html'))
{
Tools::dieOrLog(Tools::displayError('Error - The following email template is missing:').' '.$templatePath.$template.'.txt', $die);
Tools::dieOrLog(Tools::displayError('Error - The following e-mail template is missing:').' '.$templatePath.$template.'.txt', $die);
return false;
}
$templateHtml = file_get_contents($templatePath.$template.'.html');

4
classes/Module.php
View File

@@ -933,7 +933,7 @@ abstract class ModuleCore
$memory_threshold = (Tools::isX86_64arch() ? 3 : 1.5);
if (($memory_limit - $current_memory) <= ($memory_threshold * 1024 * 1024))
{
$errors[] = Tools::displayError('All modules cannot be loaded due to memory limit restriction reason, please increase your memory_limit value on your server configuration');
$errors[] = Tools::displayError('All modules cannot be loaded due to memory limit restrictions, please increase your memory_limit value on your server configuration');
break;
}
}
@@ -1121,7 +1121,7 @@ abstract class ModuleCore
if ($errors)
{
echo '<div class="alert error"><h3>'.Tools::displayError('The following module(s) couldn\'t be loaded').':</h3><ol>';
echo '<div class="alert error"><h3>'.Tools::displayError('The following module(s) could not be loaded').':</h3><ol>';
foreach ($errors as $error)
echo '<li>'.$error.'</li>';
echo '</ol></div>';

2
classes/PaymentModule.php
View File

@@ -232,7 +232,7 @@ abstract class PaymentModuleCore extends Module
if (!$order_creation_failed & isset($order->id))
{
if (!$secure_key)
$message .= '<br />'.Tools::displayError('Warning : the secure key is empty, check your payment account before validation');
$message .= '<br />'.Tools::displayError('Warning: the secure key is empty, check your payment account before validation');
// Optional message to attach to this order
if (isset($message) & !empty($message))
{

12
classes/controller/AdminController.php
View File

@@ -269,7 +269,7 @@ class AdminControllerCore extends Controller
1 => $this->l('Deletion successful'), 2 => $this->l('Selection successfully deleted'),
3 => $this->l('Creation successful'), 4 => $this->l('Update successful'),
5 => $this->l('Status update successful'), 6 => $this->l('Settings update successful'),
7 => $this->l('Image successfully deleted'), 8 => $this->l('Module downloaded successfully'),
7 => $this->l('Image successfully deleted'), 8 => $this->l('Module downloaded successfullyc'),
9 => $this->l('Thumbnails successfully regenerated'), 10 => $this->l('Message sent to the customer'),
11 => $this->l('Comment added'), 12 => $this->l('Module(s) installed successfully'),
13 => $this->l('Module(s) uninstalled successfully'), 14 => $this->l('Language successfully copied'),
@@ -277,12 +277,12 @@ class AdminControllerCore extends Controller
17 => $this->l('Module removed successfully from hook'), 18 => $this->l('Upload successful'),
19 => $this->l('Duplication completed successfully'), 20 => $this->l('Translation added successfully but the language has not been created'),
21 => $this->l('Module reset successfully'), 22 => $this->l('Module deleted successfully'),
23 => $this->l('Localization pack imported successfully'), 24 => $this->l('Refund Successful'),
23 => $this->l('Localization pack imported successfully'), 24 => $this->l('Localization pack imported successfully'),
25 => $this->l('Images successfully moved'),
26 => $this->l('Cover selection saved'),
27 => $this->l('Image shop association modified'),
28 => $this->l('Zone affected to the selection successfully'),
29 => $this->l('Upgrade succeed')
28 => $this->l('Zone assigned to the selection successfully'),
29 => $this->l('Upgrade successful')
);
if (!$this->identifier) $this->identifier = 'id_'.$this->table;
if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
@@ -425,7 +425,7 @@ class AdminControllerCore extends Controller
if (isset($value[0]) && !empty($value[0]))
{
if (!Validate::isDate($value[0]))
$this->errors[] = Tools::displayError('\'from:\' date format is invalid (YYYY-MM-DD)');
$this->errors[] = Tools::displayError('\'From:\' date format is invalid (YYYY-MM-DD)');
else
$sql_filter .= ' AND '.pSQL($key).' >= \''.pSQL(Tools::dateFrom($value[0])).'\'';
}
@@ -433,7 +433,7 @@ class AdminControllerCore extends Controller
if (isset($value[1]) && !empty($value[1]))
{
if (!Validate::isDate($value[1]))
$this->errors[] = Tools::displayError('\'to:\' date format is invalid (YYYY-MM-DD)');
$this->errors[] = Tools::displayError('\'To:\' date format is invalid (YYYY-MM-DD)');
else
$sql_filter .= ' AND '.pSQL($key).' <= \''.pSQL(Tools::dateTo($value[1])).'\'';
}

4
classes/helper/HelperList.php
View File

@@ -342,7 +342,7 @@ class HelperListCore extends Helper
protected function displayDuplicateLink($token = null, $id, $name = null)
{
$tpl = $this->createTemplate('list_action_duplicate.tpl');
if (!array_key_exists('Duplicate', self::$cache_lang))
if (!array_key_exists('Bad SQL query', self::$cache_lang))
self::$cache_lang['Duplicate'] = $this->l('Duplicate', 'Helper');
if (!array_key_exists('Copy images too?', self::$cache_lang))
@@ -449,7 +449,7 @@ class HelperListCore extends Helper
self::$cache_lang['Delete'] = $this->l('Delete', 'Helper');
if (!array_key_exists('DeleteItem', self::$cache_lang))
self::$cache_lang['DeleteItem'] = $this->l('Delete selected item ?', 'Helper');
self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper');
if (!array_key_exists('Name', self::$cache_lang))
self::$cache_lang['Name'] = $this->l('Name:', 'Helper');

4
controllers/admin/AdminAccountingExportController.php
View File

@@ -126,7 +126,7 @@ class AdminAccountingExportControllerCore extends AdminController
if (!is_writeable($this->downloadDir))
$this->errors[] = $this->l('The download folder doesn\'t have the sufficient right');
if (!($this->fd = fopen($this->downloadFile, 'w+')))
$this->errors[] = $this->l('The file can\'t be opened or created, please check the right');
$this->errors[] = $this->l('The file can\'t be opened or created, please check the rights');
@chmod($this->downloadFile, 0777);
}
@@ -288,7 +288,7 @@ class AdminAccountingExportControllerCore extends AdminController
$buffer .= '"'.$val.'";';
fwrite($this->fd, mb_convert_encoding(rtrim($buffer, ';')."\r\n", 'UTF-16LE'));
}
$this->confirmations[] = $this->l('Export has been successfully done');
$this->confirmations[] = $this->l('Export has been successfully completed');
return true;
}
return false;

18
controllers/admin/AdminAccountingRegisteredNumberController.php
View File

@@ -44,11 +44,11 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'table' => 'accounting_product_zone_shop',
'fields' => array(
'p.account_number' => $this->l('Account number'),
'COUNT(*) AS total' => $this->l('Number of product associated to this account')
'COUNT(*) AS total' => $this->l('Number of products associated with this account')
),
'group_by' => 'account_number',
'condition' => 'p.account_number <> "" AND account_number IS NOT NULL',
'title' => $this->l('Product account number list'),
'title' => $this->l('Product account numbers'),
'list' => array()),
// Taxes definition
@@ -56,11 +56,11 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'table' => 'tax',
'fields' => array(
'account_number' => $this->l('Account number'),
'COUNT(*) AS total' => $this->l('Number of taxes associated to this account')
'COUNT(*) AS total' => $this->l('Number of taxes associated with this account')
),
'group_by' => 'account_number',
'condition' => 'account_number <> "" AND account_number IS NOT NULL',
'title' => $this->l('Taxes Account number list'),
'title' => $this->l('Tax account numbers'),
'list' => array()),
// Gift wrapping definition
@@ -69,9 +69,9 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'key' => 'account_gift_wripping',
'fields' => array(
'account_number' => $this->l('Account number'),
'total' => $this->l('Number of gift-wrapping associated to this account')
'total' => $this->l('Number of gift-wrapping options associated with this account')
),
'title' => $this->l('Gift wrapping account number list'),
'title' => $this->l('Gift-wrapping account numbers'),
'list' => array()),
// Submited shipping charge definition
@@ -106,7 +106,7 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
),
'group_by' => 'account_number',
'condition' => 'account_number <> "" AND account_number IS NOT NULL',
'title' => $this->l('Customer account number list'),
'title' => $this->l('Customer account numbers'),
'list' => array()),
// Zone shop definition
@@ -114,11 +114,11 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'table' => 'accounting_zone_shop',
'fields' => array(
'p.account_number' => $this->l('Account number'),
'COUNT(*) AS total' => $this->l('Number of zone associated to this account')
'COUNT(*) AS total' => $this->l('Number of zones associated with this account')
),
'group_by' => 'account_number',
'condition' => 'account_number <> "" AND account_number IS NOT NULL',
'title' => $this->l('Zone shop account number list'),
'title' => $this->l('Zone shop account numbers'),
'list' => array())
);
}

10
controllers/admin/AdminAddressesController.php
View File

@@ -57,7 +57,7 @@ class AdminAddressesControllerCore extends AdminController
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
'address1' => array('title' => $this->l('Address')),
'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 80),
'postcode' => array('title' => $this->l('Postcode / Zip Code'), 'align' => 'right', 'width' => 80),
'city' => array('title' => $this->l('City'), 'width' => 150),
'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countries_array, 'filter_key' => 'cl!id_country'));
@@ -249,7 +249,7 @@ class AdminAddressesControllerCore extends AdminController
{
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('Postcode/ Zip Code'),
'label' => $this->l('Postcode / Zip Code'),
'name' => 'postcode',
'size' => 33,
'required' => true,
@@ -348,14 +348,14 @@ class AdminAddressesControllerCore extends AdminController
$zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp);
$zip_regexp = str_replace('C', $country->iso_code, $zip_regexp);
if (!preg_match($zip_regexp, $postcode))
$this->errors[] = Tools::displayError('Your zip/postal code is incorrect.').'<br />'.
$this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.').'<br />'.
Tools::displayError('Must be typed as follows:').' '.
str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $zip_code_format)));
}
else if ($zip_code_format)
$this->errors[] = Tools::displayError('Postcode required.');
$this->errors[] = Tools::displayError('Postcode / Zip code required.');
else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode))
$this->errors[] = Tools::displayError('Your zip/postal code is incorrect.');
$this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.');
}
/* If this address come from order's edition and is the same as the other one (invoice or delivery one)

14
controllers/admin/AdminAdminPreferencesController.php
View File

@@ -98,7 +98,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'default' => '2'
),
'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
'title' => $this->l('Limit upload file value'),
'title' => $this->l('File value upload limit'),
'desc' => $this->l('Define the limit upload for a downloadable product, this value have to be inferior or equal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
'validation' => 'isInt',
'cast' => 'intval',
@@ -107,7 +107,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'default' => '1'
),
'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
'title' => $this->l('Limit upload image value'),
'title' => $this->l('Image value upload limit'),
'desc' => $this->l('Define the limit upload for an image, this value have to be inferior or equal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
'validation' => 'isInt',
'cast' => 'intval',
@@ -131,7 +131,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
),
'PS_HIDE_OPTIMIZATION_TIPS' => array(
'title' => $this->l('Hide optimization tips'),
'desc' => $this->l('Hide optimization tips on the back office homepage'),
'desc' => $this->l('Hide optimization tips on the Back Office homepage'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
@@ -144,21 +144,21 @@ class AdminAdminPreferencesControllerCore extends AdminController
'fields' => array(
'PS_SHOW_NEW_ORDERS' => array(
'title' => $this->l('Show notifications for new orders'),
'desc' => $this->l('This will display notifications when new orders will be made on your shop'),
'desc' => $this->l('This will display notifications when new orders are made on your shop'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_SHOW_NEW_CUSTOMERS' => array(
'title' => $this->l('Show notifications for new customers'),
'desc' => $this->l('This will display notifications when new customers will register on your shop'),
'desc' => $this->l('This will display notifications when new customers register on your shop'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_SHOW_NEW_MESSAGES' => array(
'title' => $this->l('Show notifications for new messages'),
'desc' => $this->l('This will display notifications when new messages will be posted on your shop'),
'desc' => $this->l('This will display notifications when new messages are posted on your shop'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
@@ -176,7 +176,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
if (Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE') > $max_size || Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE') > $max_size)
{
$this->errors[] = Tools::displayError('The limit choosen is superior to the server\'s maximum upload file You need to improve the limit of your server.');
$this->errors[] = Tools::displayError('The limit chosen is larger than the server\'s maximum upload limit. Please increase the limits of your server.');
return;
}

6
controllers/admin/AdminAttachmentsController.php
View File

@@ -129,7 +129,7 @@ class AdminAttachmentsControllerCore extends AdminController
/* PrestaShop demo mode */
if (_PS_MODE_DEMO_)
{
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
$this->errors[] = Tools::displayError('This functionality has been disabled.');
return;
}
/* PrestaShop demo mode*/
@@ -167,10 +167,10 @@ class AdminAttachmentsControllerCore extends AdminController
$max_post = (int)ini_get('post_max_size');
$upload_mb = min($max_upload, $max_post);
$this->errors[] = $this->l('the File').' <b>'.$_FILES['file']['name'].'</b> '.
$this->l('exceeds the size allowed by the server. This limit is set to').' <b>'.$upload_mb.$this->l('Mb').'</b>';
$this->l('exceeds the size allowed by the server. The limit is set to').' <b>'.$upload_mb.$this->l('MB').'</b>';
}
else if (!empty($_FILES['file']['tmp_name']))
$this->errors[] = $this->l('No file or your file isn\'t uploadable, check your server configuration about the upload maximum size.');
$this->errors[] = $this->l('No file or your file is not uploadable, please check your server configuration for the maximum upload size.');
}
$this->validateRules();
}

4
controllers/admin/AdminAttributeGeneratorController.php
View File

@@ -223,9 +223,9 @@ class AdminAttributeGeneratorControllerCore extends AdminController
{
if (!Combination::isFeatureActive())
{
$this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').'
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').'
<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.
$this->l('Performances').'</a>');
$this->l('Performance').'</a>');
return;
}

6
controllers/admin/AdminAttributesGroupsController.php
View File

@@ -212,7 +212,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'size' => 33,
'required' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'desc' => $this->l('Term or phrase displayed to the customer')
'desc' => $this->l('Group name displayed to the customer')
),
array(
'type' => 'select',
@@ -310,7 +310,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 33,
'desc' => $this->l('HTML colors only (e.g.,').' "lightblue", "#CC6600")'
'desc' => $this->l('HTML colors only (e.g.').' "lightblue", "#CC6600")'
);
$this->fields_form['input'][] = array(
@@ -423,7 +423,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
{
if (!Combination::isFeatureActive())
{
$this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').
' <a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').
'#featuresDetachables">'.$this->l('Performances').'</a>');
return;

10
controllers/admin/AdminBackupController.php
View File

@@ -52,7 +52,7 @@ class AdminBackupControllerCore extends AdminController
'fields' => array(
'PS_BACKUP_ALL' => array(
'title' => $this->l('Ignore statistics tables:'),
'desc' => $this->l('The following tables will NOT be backed up if you enable this option:').'
'desc' => $this->l('If enabled, the following tables will NOT be backed up:').'
<br />'._DB_PREFIX_.'connections, '._DB_PREFIX_.'connections_page, '._DB_PREFIX_.'connections_source, '.
_DB_PREFIX_.'guest, '._DB_PREFIX_.'statssearch',
'cast' => 'intval',
@@ -60,7 +60,7 @@ class AdminBackupControllerCore extends AdminController
),
'PS_BACKUP_DROP_TABLE' => array(
'title' => $this->l('Drop existing tables during import:'),
'desc' => $this->l('Select this option to instruct the backup file to drop your tables prior to restoring the backed up data').
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring the backed up data').
'<br />(ie. "DROP TABLE IF EXISTS")',
'cast' => 'intval',
'type' => 'bool'
@@ -142,14 +142,14 @@ class AdminBackupControllerCore extends AdminController
/* PrestaShop demo mode */
if (_PS_MODE_DEMO_)
{
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
$this->errors[] = Tools::displayError('This functionality has been disabled.');
return;
}
/* PrestaShop demo mode*/
// Test if the backup dir is writable
if (!is_writable(_PS_ADMIN_DIR_.'/backups/'))
$this->warnings[] = $this->l('"Backups" Directory in admin directory must be writeable (CHMOD 755 / 777)');
$this->warnings[] = $this->l('\\"Backups\\" Directory in admin directory must be writeable (CHMOD 755 / 777)');
if ($this->display == 'add' && is_writable(_PS_ADMIN_DIR_.'/backups/'))
{
@@ -218,7 +218,7 @@ class AdminBackupControllerCore extends AdminController
$dh = @opendir(_PS_ADMIN_DIR_.'/backups/');
if ($dh === false)
{
$this->errors[] = Tools::displayError('Unable to open backup directory .').addslashes(_PS_ADMIN_DIR_.'/backups/').'"';
$this->errors[] = Tools::displayError('Unable to open backup directory.').addslashes(_PS_ADMIN_DIR_.'/backups/').'"';
return;
}
while (($file = readdir($dh)) !== false)

76
controllers/admin/AdminCarriersController.php
View File

@@ -83,7 +83,7 @@ class AdminCarriersControllerCore extends AdminController
'width' => 25
),
'is_free' => array(
'title' => $this->l('Is Free'),
'title' => $this->l('Free Shipping'),
'align' => 'center',
'icon' => array(
0 => 'disabled.gif',
@@ -119,23 +119,23 @@ class AdminCarriersControllerCore extends AdminController
'fields' => array(
'PS_CARRIER_DEFAULT' => array(
'title' => $this->l('Default carrier:'),
'desc' => $this->l('The default carrier used in shop'),
'desc' => $this->l('Your shop\'s default carrier'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_carrier',
'list' => Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)
),
'PS_CARRIER_DEFAULT_SORT' => array(
'title' => $this->l('Carrier default sort:'),
'desc' => $this->l('This default sort will be available only on front-office'),
'title' => $this->l('Sort by:'),
'desc' => $this->l('This will only be visible in the Front Office'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'value',
'list' => $carrier_default_sort
),
'PS_CARRIER_DEFAULT_ORDER' => array(
'title' => $this->l('Carrier default order:'),
'desc' => $this->l('This default order will be available only on front-office'),
'title' => $this->l('Order by:'),
'desc' => $this->l('This will only be visible in the Front Office'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'value',
@@ -152,28 +152,28 @@ class AdminCarriersControllerCore extends AdminController
public function renderList()
{
$this->displayInformation(
'&nbsp;<b>'.$this->l('How to create a new carrier?').'</b>
'&nbsp;<b>'.$this->l('How do I create a new carrier?').'</b>
<br />
<ul>
<li>'.$this->l('Click "Add new".').'<br /></li>
<li>'.$this->l('Fill in the fields and click "Save".').'</li>
<li>'.$this->l('Click \\"Add new.\\"').'<br /></li>
<li>'.$this->l('Fill in the fields and click \\"Save.\\"').'</li>
<li>'.
$this->l('You need to decide a price range or a weight range for which the new carrier will be available.').' '.
$this->l('Under the "Shipping" tab, click either "Price Ranges" or "Weight Ranges".').'
$this->l('You need to set a price range or a weight range for which the new carrier will be available.').' '.
$this->l('Under the \\"Shipping\\" tab, click either \\"Price Ranges\\" or \\"Weight Ranges.\\"').'
</li>
<li>'.$this->l('Click "Add new".').'</li>
<li>'.$this->l('Click \\"Add new.\\"').'</li>
<li>'.
$this->l('Select the name of the carrier and define the price range or the weight range.').' '.
$this->l('For example the carrier can be made available for a weight range between 0 and 5kgs. Another carrier will have a range between 5 and 10kgs.').'
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier will have a range between 5 and 10lbs.').'
</li>
<li>'.$this->l('When you are done, click "Save".').'</li>
<li>'.$this->l('Click on the "Shipping" tab.').'</li>
<li>'.$this->l('When you are done, click \\"Save.\\"').'</li>
<li>'.$this->l('Click on the \\"Shipping\\" tab.').'</li>
<li>'.
$this->l('You need to choose the fees that will be applied for this carrier.').' '.
$this->l('At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
$this->l('You need to set the fees that will be applied for this carrier.').' '.
$this->l('At the bottom on the page, in the \\"Fees\\" section, select the name of the carrier.').'
</li>
<li>'.$this->l('For each zone, enter a price. Click "Save".').'</li>
<li>'.$this->l('You\'re set! The new carrier will be displayed to your customers.').'</li>
<li>'.$this->l('For each zone, enter a price and click \\"Save.\\"').'</li>
<li>'.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'</li>
</ul>'
);
$this->_select = 'b.*';
@@ -202,14 +202,14 @@ class AdminCarriersControllerCore extends AdminController
'hint' => $this->l('Allowed characters: letters, spaces and').' ().-',
'desc' => array(
$this->l('Carrier name displayed during checkout'),
$this->l('With a value of 0, the carrier name will be replaced by the shop name')
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name')
)
),
array(
'type' => 'file',
'label' => $this->l('Logo:'),
'name' => 'logo',
'desc' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
'desc' => $this->l('Upload a logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
),
array(
'type' => 'text',
@@ -219,22 +219,22 @@ class AdminCarriersControllerCore extends AdminController
'required' => true,
'size' => 41,
'maxlength' => 128,
'desc' => $this->l('Time taken for product delivery; displayed during checkout')
'desc' => $this->l('Estimated delivery time, displayed during checkout')
),
array(
'type' => 'text',
'label' => $this->l('Grade:'),
'label' => $this->l('Speed Grade:'),
'name' => 'grade',
'required' => false,
'size' => 1,
'desc' => $this->l('"0" for a longest shipping delay,"9" for the shortest shipping delay.')
'desc' => $this->l('\\"0\\" for a longest shipping delay,\\"9\\" for the shortest shipping delay.')
),
array(
'type' => 'text',
'label' => $this->l('URL:'),
'name' => 'url',
'size' => 40,
'desc' => $this->l('URL for the tracking number; type \'@\' where the tracking number will appear')
'desc' => $this->l('Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number')
),
array(
'type' => 'checkbox',
@@ -245,14 +245,14 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id_zone',
'name' => 'name'
),
'desc' => $this->l('The zone in which this carrier is to be used')
'desc' => $this->l('The zones in which this carrier is to be used')
),
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'desc' => $this->l('Mark all groups you want to give access to this carrier')
'desc' => $this->l('Mark all groups for which you want to give access to this carrier')
),
array(
'type' => 'radio',
@@ -273,7 +273,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Include or exclude carrier from list of carriers on Front Office')
'desc' => $this->l('Enable carrier in the Front Office')
),
array(
'type' => 'radio',
@@ -293,7 +293,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
)
),
'desc' => $this->l('Apply shipping costs and additional shipping costs by products in carrier price')
'desc' => $this->l('Apply both regular shipping cost and product-specific additional shipping costs')
),
array(
'type' => 'select',
@@ -373,7 +373,7 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'desc' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)')
'desc' => $this->l('Out-of-range behavior when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
),
array(
'type' => 'text',
@@ -381,7 +381,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_height',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum height managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum height managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
@@ -389,23 +389,23 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_width',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum width managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
'label' => $this->l('Maximium package deep:'),
'label' => $this->l('Maximium package depth:'),
'name' => 'max_depth',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum deep managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum depth managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
'label' => $this->l('Maximium package weigth:'),
'label' => $this->l('Maximium package weight:'),
'name' => 'max_weight',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or nothing, to ignore this field.')
'desc' => $this->l('Maximum weight managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'hidden',
@@ -530,7 +530,7 @@ class AdminCarriersControllerCore extends AdminController
if ($this->tabAccess['edit'] === '1')
{
if (Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT'))
$this->errors[] = Tools::displayError('You can\'t disable the default carrier, please change your default carrier first.');
$this->errors[] = Tools::displayError('You cannot disable the default carrier, please change your default carrier first.');
else
parent::postProcess();
}
@@ -541,7 +541,7 @@ class AdminCarriersControllerCore extends AdminController
{
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox')))
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
$this->errors[] = $this->l('Please set another carrier as default before deleting');
$this->errors[] = $this->l('Please set another carrier as default before deleting this one');
else
{
// if deletion : removes the carrier from the warehouse/carrier association

4
controllers/admin/AdminCartRulesController.php
View File

@@ -68,7 +68,7 @@ class AdminCartRulesControllerCore extends AdminController
if ((int)Tools::getValue('minimum_amount') < 0)
$this->errors[] = Tools::displayError('Minimum amount cannot be lower than 0');
if ((float)Tools::getValue('reduction_percent') < 0 || (float)Tools::getValue('reduction_percent') > 100)
$this->errors[] = Tools::displayError('Reduction percent must range from 0% to 100%');
$this->errors[] = Tools::displayError('Reduction percent must be between 0% and 100%');
if ((int)Tools::getValue('reduction_amount') < 0)
$this->errors[] = Tools::displayError('Reduction amount cannot be lower than 0');
}
@@ -467,7 +467,7 @@ class AdminCartRulesControllerCore extends AdminController
'show_toolbar' => true,
'toolbar_btn' => $this->toolbar_btn,
'toolbar_scroll' => $this->toolbar_scroll,
'title' => $this->l('Payment : Cart Rules '),
'title' => $this->l('Payment: Cart Rules'),
'defaultDateFrom' => date('Y-m-d H:00:00'),
'defaultDateTo' => date('Y-m-d H:00:00', strtotime('+1 month')),
'customerFilter' => $customer_filter,

4
controllers/admin/AdminCartsController.php
View File

@@ -51,7 +51,7 @@ class AdminCartsControllerCore extends AdminController
'width' => 25
),
'id_order' => array(
'title' => $this->l('ID Order'),
'title' => $this->l('Order ID'),
'align' => 'center', 'width' => 25
),
'customer' => array(
@@ -249,7 +249,7 @@ class AdminCartsControllerCore extends AdminController
if (!$this->context->cart->id)
return;
if ($this->context->cart->OrderExists())
$errors[] = Tools::displayError('An order already placed with this cart');
$errors[] = Tools::displayError('An order has already been placed with this cart');
elseif (!($id_product = (int)Tools::getValue('id_product')) || !($product = new Product((int)$id_product, true, $this->context->language->id)))
$errors[] = Tools::displayError('Invalid product');
elseif (!($qty = Tools::getValue('qty')) || $qty == 0)

12
controllers/admin/AdminCategoriesController.php
View File

@@ -295,9 +295,9 @@ class AdminCategoriesControllerCore extends AdminController
$guest = new Group(Configuration::get('PS_GUEST_GROUP'));
$default = new Group(Configuration::get('PS_CUSTOMER_GROUP'));
$unidentified_group_information = sprintf($this->l('%s - All persons without a customer account or unauthenticated.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
$unidentified_group_information = sprintf($this->l('%s - All people without a validated customer account.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
$guest_group_information = sprintf($this->l('%s - Customer who placed an order with the Guest Checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>');
$default_group_information = sprintf($this->l('%s - All persons who created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
$default_group_information = sprintf($this->l('%s - All people who created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
$root_category = Category::getRootCategory();
$root_category = array('id_category' => $root_category->id_category, 'name' => $root_category->name);
$this->fields_form = array(
@@ -426,15 +426,15 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'info_introduction' => $this->l('You have now three default customer groups.'),
'info_introduction' => $this->l('You now have three default customer groups.'),
'unidentified' => $unidentified_group_information,
'guest' => $guest_group_information,
'customer' => $default_group_information,
'desc' => $this->l('Mark all groups you want to give access to this category')
'desc' => $this->l('Mark all customer groups you want to give access to this category')
)
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save'),
'class' => 'button'
)
);
@@ -498,7 +498,7 @@ class AdminCategoriesControllerCore extends AdminController
$this->errors[] = Tools::displayError($this->l('Category cannot be moved here'));
}
else
$this->errors[] = Tools::displayError($this->l('Category cannot be parent of herself.'));
$this->errors[] = Tools::displayError($this->l('Category cannot be parent of itself.'));
}
parent::processAdd($token);
}

Some files were not shown because too many files have changed in this diff Show More