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

// revert to revision 14160

Browse Source
This commit is contained in:
lLefevre
2012-03-14 15:05:13 +00:00
parent e9c3b1f7d4
commit 9f4e2698ee
37 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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, hold down the "Ctrl" key, 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;">

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

@@ -33,7 +33,7 @@
<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 over your FTP. Backup files are located in "admin/backups" directory.'}</p>
{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;">
@@ -43,7 +43,7 @@
<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 dropped during Backup recovery (see "Backup options" below).'}</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>
@@ -54,16 +54,16 @@
<div class="warn width2" style="float: left;">
<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='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='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='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>
<li>{l s='Click on the \\"Go\\" button and wait during the import, the process can take several minutes'}</li>
</ol>
</div>

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

@@ -35,7 +35,7 @@
<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 dropped during Backup recovery (see "Backup options" below).'}</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>
@@ -52,16 +52,16 @@
<div class="warn width2" style="float: left;">
<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='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='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='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>
<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/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">

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

@@ -83,19 +83,19 @@
<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 existing 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 - 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.'}
{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" option 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>

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

@@ -39,7 +39,7 @@
{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 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'}";

2
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
View File

@@ -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 "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/products/combinations.tpl
View File

@@ -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/helpers/form/form.tpl
View File

@@ -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";

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

@@ -200,7 +200,7 @@ jQuery(document).ready(Customer.init);
<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>
@@ -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", tax is included)'}
{l s='(if set to \\"amount\\", tax is included)'}
</div>
</div>

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

@@ -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/referrers/helpers/form/form.tpl
View File

@@ -37,15 +37,15 @@
<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 />
@@ -60,13 +60,13 @@
<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.'}
{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>

2
controllers/admin/AdminBackupController.php
View File

@@ -149,7 +149,7 @@ class AdminBackupControllerCore extends AdminController
// 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/'))
{

26
controllers/admin/AdminCarriersController.php
View File

@@ -155,24 +155,24 @@ class AdminCarriersControllerCore extends AdminController
'&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 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."').'
$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 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 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.').'
$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 and click "Save."').'</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>'
);
@@ -227,7 +227,7 @@ class AdminCarriersControllerCore extends AdminController
'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',
@@ -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 leave this field blank to ignore this.')
'desc' => $this->l('Maximum height managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
@@ -389,7 +389,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_width',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum width managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
@@ -397,7 +397,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_depth',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum depth managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum depth managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'text',
@@ -405,7 +405,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_weight',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum weight managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
),
array(
'type' => 'hidden',

2
controllers/admin/AdminContactsController.php
View File

@@ -78,7 +78,7 @@ class AdminContactsControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('If enabled, all messages will be saved in the "Customer Service" tab'),
'desc' => $this->l('If enabled, all messages will be saved in the \\"Customer Service\\" tab'),
'values' => array(
array(
'id' => 'customer_service_on',

2
controllers/admin/AdminCountriesController.php
View File

@@ -314,7 +314,7 @@ class AdminCountriesControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Display tax label (e.g. "Tax incl."):'),
'label' => $this->l('Display tax label (e.g. \\"Tax incl.\\"):'),
'name' => 'display_tax_label',
'required' => false,
'class' => 't',

2
controllers/admin/AdminCustomerPreferencesController.php
View File

@@ -52,7 +52,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController
'fields' => array(
'PS_REGISTRATION_PROCESS_TYPE' => array(
'title' => $this->l('Registration process type'),
'desc' => $this->l('The "Only account creation" registration option allows the customer to register faster, and create his address later.'),
'desc' => $this->l('The \\"Only account creation\\" registration option allows the customer to register faster, and create his address later.'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'select',

4
controllers/admin/AdminCustomerThreadsController.php
View File

@@ -487,7 +487,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
if ($thread->status != 'pending1')
$actions['pending1'] = array(
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=3&id_customer_thread='.Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Mark this message as "pending 1" (will be answered later)')
'name' => $this->l('Mark this message as \\"pending 1\\" (will be answered later)')
);
else
$actions['pending1'] = array(
@@ -498,7 +498,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
if ($thread->status != 'pending2')
$actions['pending2'] = array(
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=4&id_customer_thread='.Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Mark this message as "pending 2" (will be answered later)')
'name' => $this->l('Mark this message as \\"pending 2\\" (will be answered later)')
);
else
$actions['pending2'] = array(

2
controllers/admin/AdminEmployeesController.php
View File

@@ -218,7 +218,7 @@ class AdminEmployeesControllerCore extends AdminController
'label' => $this->l('Back Office width'),
'name' => 'bo_width',
'size' => 10,
'desc' => $this->l('Back Office width, in pixels. The value "0" means that the Back Office width will be flexible.')
'desc' => $this->l('Back Office width, in pixels. The value \\"0\\" means that the Back Office width will be flexible.')
),
array(
'type' => 'select',

4
controllers/admin/AdminGendersController.php
View File

@@ -142,14 +142,14 @@ class AdminGendersControllerCore extends AdminController
'label' => $this->l('Image Width:'),
'name' => 'img_width',
'size' => 4,
'desc' => $this->l('Image width in pixels. Enter "0" to use original size')
'desc' => $this->l('Image width in pixels. Enter \\"0\\" to use original size')
),
array(
'type' => 'text',
'label' => $this->l('Image Height:'),
'name' => 'img_height',
'size' => 4,
'desc' => $this->l('Image height in pixels. Enter "0" to use original size')
'desc' => $this->l('Image height in pixels. Enter \\"0\\" to use original size')
)
),
'submit' => array(

2
controllers/admin/AdminImagesController.php
View File

@@ -53,7 +53,7 @@ class AdminImagesControllerCore extends AdminController
'top' => '',
'bottom' => '',
'description' => $this->l('JPEG images have a small file size and standard quality. PNG images have a bigger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.').'
<br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issues, turn it off by selecting "Use JPEG".'),
<br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issues, turn it off by selecting \\"Use JPEG\\".'),
'fields' => array(
'PS_IMAGE_QUALITY' => array(
'title' => $this->l('Image quality'),

22
controllers/admin/AdminInformationController.php
View File

@@ -91,18 +91,18 @@ class AdminInformationControllerCore extends AdminController
'system' => $this->l('Configure your server to allow the creation of directories and files with write permissions'),
'gd' => $this->l('Enable the GD library on your server'),
'mysql_support' => $this->l('Enable the MySQL support on your server'),
'config_dir' => $this->l('Set write permissions for "config" folder'),
'cache_dir' => $this->l('Set write permissions for "cache" folder'),
'sitemap' => $this->l('Set write permissions for "sitemap.xml" file'),
'img_dir' => $this->l('Set write permissions for "img" folder and subfolders, recursively'),
'mails_dir' => $this->l('Set write permissions for "mails" folder and subfolders, recursively'),
'module_dir' => $this->l('Set write permissions for "modules" folder and subfolders, recursively'),
'theme_lang_dir' => $this->l('Set write permissions for "themes/')._THEME_NAME_.$this->l('/lang/" folder and subfolders, recursively'),
'translations_dir' => $this->l('Set write permissions for "translations" folder and subfolders, recursively'),
'customizable_products_dir' => $this->l('Set write permissions for "upload" folder and subfolders, recursively'),
'virtual_products_dir' => $this->l('Set write permissions for "download" folder and subfolders, recursively'),
'config_dir' => $this->l('Set write permissions for \\"config\\" folder'),
'cache_dir' => $this->l('Set write permissions for \\"cache\\" folder'),
'sitemap' => $this->l('Set write permissions for \\"sitemap.xml\\" file'),
'img_dir' => $this->l('Set write permissions for \\"img\\" folder and subfolders, recursively'),
'mails_dir' => $this->l('Set write permissions for \\"mails\\" folder and subfolders, recursively'),
'module_dir' => $this->l('Set write permissions for \\"modules\\" folder and subfolders, recursively'),
'theme_lang_dir' => $this->l('Set write permissions for \\"themes/')._THEME_NAME_.$this->l('/lang/\\" folder and subfolders, recursively'),
'translations_dir' => $this->l('Set write permissions for \\"translations\\" folder and subfolders, recursively'),
'customizable_products_dir' => $this->l('Set write permissions for \\"upload\\" folder and subfolders, recursively'),
'virtual_products_dir' => $this->l('Set write permissions for \\"download\\" folder and subfolders, recursively'),
'fopen' => $this->l('Allow the PHP fopen() function on your server'),
'register_globals' => $this->l('Set PHP "register_global" option to "Off"'),
'register_globals' => $this->l('Set PHP \\"register_global\\" option to \\"Off\\"'),
'gz' => $this->l('Enable GZIP compression on your server')
);

4
controllers/admin/AdminInvoicesController.php
View File

@@ -216,10 +216,10 @@ class AdminInvoicesControllerCore extends AdminController
if (Tools::getValue('submitAddinvoice_date'))
{
if (!Validate::isDate(Tools::getValue('date_from')))
$this->errors[] = $this->l('Invalid "From:" date');
$this->errors[] = $this->l('Invalid \\"From:\\" date');
if (!Validate::isDate(Tools::getValue('date_to')))
$this->errors[] = $this->l('Invalid "To:" date');
$this->errors[] = $this->l('Invalid \\"To:\\" date');
if (!count($this->errors))
{

4
controllers/admin/AdminLanguagesController.php
View File

@@ -169,10 +169,10 @@ class AdminLanguagesControllerCore extends AdminController
),
array(
'type' => 'file',
'label' => $this->l('"No-picture" image:'),
'label' => $this->l('\\"No-picture\\" image:'),
'name' => 'no-picture',
'required' => true,
'desc' => $this->l('Image displayed when "no picture found"')
'desc' => $this->l('Image displayed when \\"no picture found\\"')
),
array(
'type' => 'radio',

2
controllers/admin/AdminLogsController.php
View File

@@ -53,7 +53,7 @@ class AdminLogsControllerCore extends AdminController
'fields' => array(
'PS_LOGS_BY_EMAIL' => array(
'title' => $this->l('Minimum severity level:'),
'desc' => $this->l('Enter "5" if you do not want to receive any e-mails.').'<br />'.$this->l('E-mails will be sent to the shop owner.'),
'desc' => $this->l('Enter \\"5\\" if you do not want to receive any e-mails.').'<br />'.$this->l('E-mails will be sent to the shop owner.'),
'cast' => 'intval',
'type' => 'text',
'size' => 5

6
controllers/admin/AdminMetaController.php
View File

@@ -94,7 +94,7 @@ class AdminMetaControllerCore extends AdminController
$robots_description .= '<br />'.$this->l('e.g. http://www.yoursite.com/robots.txt');
if ($this->checkConfiguration($this->rb_file))
{
$robots_description .= '<br />'.$this->l('Generate your "robots.txt" file by clicking on the following button (this will erase your old robots.txt file):');
$robots_description .= '<br />'.$this->l('Generate your \\"robots.txt\\" file by clicking on the following button (this will erase your old robots.txt file):');
$robots_submit = array('name' => 'submitRobots', 'title' => $this->l('Generate robots.txt file'));
}
else
@@ -123,7 +123,7 @@ class AdminMetaControllerCore extends AdminController
'robots' => $robots_options,
'routes' => array(
'title' => $this->l('Schema of URLs'),
'description' => $this->l('Change the pattern of your links. There are some available keywords for each route listed below, keywords with * are required. To add a keyword in your URL use {keyword} syntax. You can add some text before or after the keyword IF the keyword is not empty with syntax {prepend:keyword:append}, for example {-hey-:meta_title} will add "-hey-my-title" in URL if meta title is set, or nothing. Friendly URL and rewriting Apache option must be activated on your web server to use this functionality.'),
'description' => $this->l('Change the pattern of your links. There are some available keywords for each route listed below, keywords with * are required. To add a keyword in your URL use {keyword} syntax. You can add some text before or after the keyword IF the keyword is not empty with syntax {prepend:keyword:append}, for example {-hey-:meta_title} will add \\"-hey-my-title\\" in URL if meta title is set, or nothing. Friendly URL and rewriting Apache option must be activated on your web server to use this functionality.'),
'fields' => array(),
),
);
@@ -228,7 +228,7 @@ class AdminMetaControllerCore extends AdminController
'lang' => true,
'required' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'desc' => $this->l('e.g. "contacts" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
'desc' => $this->l('e.g. \\"contacts\\" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
'size' => 50
),
),

2
controllers/admin/AdminModulesController.php
View File

@@ -804,7 +804,7 @@ class AdminModulesControllerCore extends AdminController
$this->translationsTab['Reset'] = $this->l('Reset');
$this->translationsTab['Configure'] = $this->l('Configure');
$this->translationsTab['Delete'] = $this->l('Delete');
$this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'] = $this->l('This action will permanently remove the module from the server. Are you sure you want to do this?');
$this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'] = $this->l('This action will permanently remove the module from the server. Are you sure you want to do this ?');
}
$return = '';

2
controllers/admin/AdminOrderPreferencesController.php
View File

@@ -96,7 +96,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
),
'PS_SHIP_WHEN_AVAILABLE' => array(
'title' => $this->l('Delayed shipping'),
'desc' => $this->l('Allow the customer to split his order: one with the products currently "in stock", and another with the other products. This option will convert the customer\'s cart into two orders.'),
'desc' => $this->l('Allow the customer to split his order: one with the products currently \\"in stock\\", and another with the other products. This option will convert the customer\'s cart into two orders.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'

4
controllers/admin/AdminPPreferencesController.php
View File

@@ -174,8 +174,8 @@ class AdminPPreferencesControllerCore extends AdminController
'type' => 'bool'
),
'PS_ATTRIBUTE_CATEGORY_DISPLAY' => array(
'title' => $this->l('Display "add to cart" button when product has attributes:'),
'desc' => $this->l('Display or hide the "add to cart" button on category pages for products that have attributes to force customers to see the product detail'),
'title' => $this->l('Display \\"add to cart\\" button when product has attributes:'),
'desc' => $this->l('Display or hide the \\"add to cart\\" button on category pages for products that have attributes to force customers to see the product detail'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'

8
controllers/admin/AdminPerformanceController.php
View File

@@ -242,7 +242,7 @@ class AdminPerformanceControllerCore extends AdminController
array(
'id' => 'PS_HTML_THEME_COMPRESSION_1',
'value' => 1,
'label' => $this->l('Minify HTML after "smarty compile" execution.')
'label' => $this->l('Minify HTML after \\"smarty compile\\" execution.')
),
array(
'id' => 'PS_HTML_THEME_COMPRESSION_0',
@@ -261,7 +261,7 @@ class AdminPerformanceControllerCore extends AdminController
array(
'id' => 'PS_JS_HTML_THEME_COMPRESSION_1',
'value' => 1,
'label' => $this->l('Compress inline JavaScript in HTML after "smarty compile" execution')
'label' => $this->l('Compress inline JavaScript in HTML after \\"smarty compile\\" execution')
),
array(
'id' => 'PS_JS_HTML_THEME_COMPRESSION_0',
@@ -280,7 +280,7 @@ class AdminPerformanceControllerCore extends AdminController
array(
'id' => 'PS_HIGH_HTML_THEME_COMPRESSION_1',
'value' => 1,
'label' => $this->l('HTML is compressed but cancels the W3C validation (only when "Minify HTML" is enabled)')
'label' => $this->l('HTML is compressed but cancels the W3C validation (only when \\"Minify HTML\\" is enabled)')
),
array(
'id' => 'PS_HIGH_HTML_THEME_COMPRESSION_0',
@@ -370,7 +370,7 @@ class AdminPerformanceControllerCore extends AdminController
'title' => $this->l('Ciphering'),
'image' => '../img/admin/computer_key.png'
),
'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension \\"mcrypt\\". If you change this configuration, all cookies will be reset.'),
'input' => array(
array(
'type' => 'hidden',

8
controllers/admin/AdminRequestSqlController.php
View File

@@ -49,13 +49,13 @@ class AdminRequestSqlControllerCore extends AdminController
public function renderList()
{
$this->displayWarning($this->l('When saving the query, only the request type "SELECT" are allowed.'));
$this->displayWarning($this->l('When saving the query, only the request type \\"SELECT\\" are allowed.'));
$this->displayInformation('
<strong>'.$this->l('How to create a new sql query?').'</strong>
<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 can then view the query results by clicking on the tab:').' <img src="../img/admin/details.gif"></li>
<li>'.$this->l('You can then export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif"></li>
</ul>
@@ -305,7 +305,7 @@ class AdminRequestSqlControllerCore extends AdminController
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
else if (isset($e[$key]['*']))
$this->errors[] = Tools::DisplayError($this->l('The operator "*" can be used in a nested query.'));
$this->errors[] = Tools::DisplayError($this->l('The operator \\"*\\" can be used in a nested query.'));
else
$this->errors[] = Tools::DisplayError($this->l('Error'));
break;

6
controllers/admin/AdminSearchConfController.php
View File

@@ -65,11 +65,11 @@ class AdminSearchConfControllerCore extends AdminController
'title' => $this->l('Indexation'),
'icon' => 'search',
'info' =>
$this->l('The "indexed" products have been analyzed by PrestaShop and will appear in the results of the Front Office search.').'<br />
$this->l('The \\"indexed\\" products have been analyzed by PrestaShop and will appear in the results of the Front Office search.').'<br />
'.$this->l('Indexed products:').' <b>'.(int)$indexed.' / '.(int)$total.'</b>.
</p>
<p>'.$this->l('Building the product index can take a few minutes or more.')
.$this->l('If your server stops the process before it ends, you can resume the indexation by clicking "Add missing products."').'</p>
.$this->l('If your server stops the process before it ends, you can resume the indexation by clicking \\"Add missing products.\\"').'</p>
-&gt; <a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.
$this->l('Add missing products to index.').'</a><br />
-&gt; <a href="searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.
@@ -116,7 +116,7 @@ class AdminSearchConfControllerCore extends AdminController
'title' => $this->l('Weight'),
'icon' => 'weight',
'info' =>
$this->l('The "weight" represents its importance and relevance for the ranking of the products when try a new search.').'<br />
$this->l('The \\"weight\\" represents its importance and relevance for the ranking of the products when try a new search.').'<br />
'.$this->l('A word with a weight of 8 will have 4 times more value than a word with a weight of 2.').'<br /><br />
'.$this->l('That\'s why we advise to set a greater weight for words which appear in the name or reference of a product than the ones in the description. Thus, the search results will be as precise and relevant as possible.'),
'fields' => array(

4
controllers/admin/AdminSlipController.php
View File

@@ -112,9 +112,9 @@ class AdminSlipControllerCore extends AdminController
if (Tools::getValue('submitAddorder_slip'))
{
if (!Validate::isDate(Tools::getValue('date_from')))
$this->errors[] = $this->l('Invalid "From" date');
$this->errors[] = $this->l('Invalid \\"From\\" date');
if (!Validate::isDate(Tools::getValue('date_to')))
$this->errors[] = $this->l('Invalid "To" date');
$this->errors[] = $this->l('Invalid \\"To\\" date');
if (!count($this->errors))
{
$order_slips = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));

2
controllers/admin/AdminTranslationsController.php
View File

@@ -1438,7 +1438,7 @@ class AdminTranslationsControllerCore extends AdminController
<div>';
$str_return .= '
<div class="label-subject">
<b>'.$this->l('"title" tag:').'</b>&nbsp;'.(isset($title['en']) ? $title['en'] : '').'<br />
<b>'.$this->l('\\"title\\" tag:').'</b>&nbsp;'.(isset($title['en']) ? $title['en'] : '').'<br />
<input type="text" name="title_'.$group_name.'_'.$mail_name.'" value="'.(isset($title[$lang]) ? $title[$lang] : '').'" />
</div><!-- .label-subject -->';
$str_return .= '

2
modules/blockcontactinfos/config.xml
View File

@@ -3,7 +3,7 @@
<name>blockcontactinfos</name>
<displayName><![CDATA[Block contact infos]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Add a block to add some information about contacting the shop]]></description>
<description><![CDATA[Add a block to add some informations about contacting the shop]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blocklayered/config.xml
View File

@@ -8,5 +8,5 @@
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
<limited_countries></limited_countries>
</module>

2
modules/loyalty/config.xml
View File

@@ -7,7 +7,7 @@
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[pricing_promotion]]></tab>
<confirmUninstall>Are you sure you want to delete all loyalty points and customer history?</confirmUninstall>
<is_configurable>1</is_configurable>
<is_configurable>0</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
</module>