From 9f4e2698ee7aa89aabcdbb38038ea3e5de5ca4ac Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 14 Mar 2012 15:05:13 +0000 Subject: [PATCH] // revert to revision 14160 --- .../attribute_generator/content.tpl | 2 +- .../controllers/backup/download/view.tpl | 20 +++++++------- .../backup/helpers/list/list_header.tpl | 18 ++++++------- .../controllers/cart_rules/informations.tpl | 2 +- .../template/controllers/images/content.tpl | 6 ++--- .../languages/helpers/form/form.tpl | 2 +- .../controllers/orders/_new_product.tpl | 2 +- .../controllers/products/combinations.tpl | 4 +-- .../products/helpers/form/form.tpl | 2 +- .../template/controllers/products/prices.tpl | 4 +-- .../controllers/products/suppliers.tpl | 2 +- .../referrers/helpers/form/form.tpl | 12 ++++----- controllers/admin/AdminBackupController.php | 2 +- controllers/admin/AdminCarriersController.php | 26 +++++++++---------- controllers/admin/AdminContactsController.php | 2 +- .../admin/AdminCountriesController.php | 2 +- .../AdminCustomerPreferencesController.php | 2 +- .../admin/AdminCustomerThreadsController.php | 4 +-- .../admin/AdminEmployeesController.php | 2 +- controllers/admin/AdminGendersController.php | 4 +-- controllers/admin/AdminImagesController.php | 2 +- .../admin/AdminInformationController.php | 22 ++++++++-------- controllers/admin/AdminInvoicesController.php | 4 +-- .../admin/AdminLanguagesController.php | 4 +-- controllers/admin/AdminLogsController.php | 2 +- controllers/admin/AdminMetaController.php | 6 ++--- controllers/admin/AdminModulesController.php | 2 +- .../admin/AdminOrderPreferencesController.php | 2 +- .../admin/AdminPPreferencesController.php | 4 +-- .../admin/AdminPerformanceController.php | 8 +++--- .../admin/AdminRequestSqlController.php | 8 +++--- .../admin/AdminSearchConfController.php | 6 ++--- controllers/admin/AdminSlipController.php | 4 +-- .../admin/AdminTranslationsController.php | 2 +- modules/blockcontactinfos/config.xml | 2 +- modules/blocklayered/config.xml | 2 +- modules/loyalty/config.xml | 2 +- 37 files changed, 101 insertions(+), 101 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl index 4d6d0d820..8eadb2235 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl +++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl @@ -76,7 +76,7 @@
{l s='Attributes generator'} -
{l s='To generate the attributes, hold down the "Ctrl" key, select your attributes and click "Add".'}
+
{l s='To generate the attributes, hold down the \\"Ctrl\\" key, select your attributes and click \\"Add\\".'}
-

{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".'}

+

{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\\".'}

diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 4f3b4af2f..14b113990 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/content.tpl @@ -83,19 +83,19 @@
{if $safe_mode}
- {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.'}
{else}
{l s='Move images'}
{l s='You can choose to keep your images stored in the previous system - there is nothing wrong with that.'}
- {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.'}

  {l s='After moving all of your product images, for best performance go to the '} {l s='product preferences tab'} - {l s='and set "Use the legacy image filesystem" option to "No".'} + {l s='and set \\"Use the legacy image filesystem\\" option to \\"No\\".'}
diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl index b3b013d32..0d75b59f2 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl @@ -39,7 +39,7 @@ {block name=script} var langPackOk = "\"\" {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 = "\"\" {l s='No language pack available on prestashop.com for this ISO code'}"; var download = "{l s='Download'}"; diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl index 59e9562e7..ad033774a 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl @@ -72,7 +72,7 @@
-

{l s='If you don't select "Free shipping," the normal shipping cost will be applied'}

+

{l s='If you don\'t select \\"Free shipping,\\" the normal shipping cost will be applied'}

diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index 956338c9d..cd00205e8 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -181,7 +181,7 @@ {if $currency->format % 2 != 0}{$currency->sign}{/if} {if $currency->format % 2 == 0} {$currency->sign} {/if}({l s='leave blank if the price does not change'}) - + @@ -244,7 +244,7 @@ {if $currency->format % 2 != 0}{$currency->sign}{/if} {if $currency->format % 2 == 0} {$currency->sign}{/if} - ({l s='overrides Eco-tax on "Information" tab'}) + ({l s='overrides Eco-tax on \\"Information\\" tab'}) {/if} diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index e51eb959c..7eb6cd491 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl @@ -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"; diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl index 191df9dc2..902913e2d 100644 --- a/admin-dev/themes/default/template/controllers/products/prices.tpl +++ b/admin-dev/themes/default/template/controllers/products/prices.tpl @@ -200,7 +200,7 @@ jQuery(document).ready(Customer.init); - on_sale}checked="checked"{/if} value="1" />  + on_sale}checked="checked"{/if} value="1" />  @@ -360,7 +360,7 @@ jQuery(document).ready(Customer.init); - {l s='(if set to "amount", tax is included)'} + {l s='(if set to \\"amount\\", tax is included)'}
diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl index 20d4682b6..e0f1c8ebc 100644 --- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl +++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl @@ -73,7 +73,7 @@ {else}

{l s='You can specify product reference(s) for each supplier associated.'}

{/if} -

{l s='Click "Save and Stay" after changing selected suppliers to display the associated product references.'}

+

{l s='Click \\"Save and Stay\\" after changing selected suppliers to display the associated product references.'}

{foreach from=$associated_suppliers item=supplier}

{$supplier->name}

diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl index 02ee6f75e..abff7dcb8 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl @@ -37,15 +37,15 @@
  • {l s='The field `http_referer` is the website from which your customers arrive.'}
    - {l s='For example, visitors coming from Google will have a `http_referer` like this one: "http://www.google.com/search?q=prestashop".'}
    + {l s='For example, visitors coming from Google will have a `http_referer` like this one: \\"http://www.google.com/search?q=prestashop\\".'}
    {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.'}
    - {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.'}
    + {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.'}

  • {l s='The field `request_uri` is the URL from which the customers come to your website.'}
    {l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".
    - {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.'}

    • @@ -60,13 +60,13 @@
  • {l s='When using the simple mode, you can use some generic characters which can replace any characters:'}
      -
    • {l s='"_" will replace one character. If you want to use the real "_", you should type'} "\\_".
      • -
    • {l s='"%" will replace any number of characters. If you want to use the real "%", you should type'} "\\%".
      • +
    • {l s='\\"_\\" will replace one character. If you want to use the real \\"_\\", you should type'} "\\_".
      • +
    • {l s='\\"%\\" will replace any number of characters. If you want to use the real \\"%\\", you should type'} "\\%".

  • - {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.'} {l s='Take a look at our documentation for more details...'}
diff --git a/controllers/admin/AdminBackupController.php b/controllers/admin/AdminBackupController.php index e39cb2cf5..88ea35149 100644 --- a/controllers/admin/AdminBackupController.php +++ b/controllers/admin/AdminBackupController.php @@ -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/')) { diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 5180fadcd..740cf3499 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -155,24 +155,24 @@ class AdminCarriersControllerCore extends AdminController ' '.$this->l('How do I create a new carrier?').'
    -
  • '.$this->l('Click "Add new."').'
    • -
  • '.$this->l('Fill in the fields and click "Save."').'
    • +
  • '.$this->l('Click \\"Add new.\\"').'
    • +
  • '.$this->l('Fill in the fields and click \\"Save.\\"').'
  • '. $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.\\"').'
    • -
  • '.$this->l('Click "Add new."').'
    • +
  • '.$this->l('Click \\"Add new.\\"').'
  • '. $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.').'
    • -
  • '.$this->l('When you are done, click "Save."').'
    • -
  • '.$this->l('Click on the "Shipping" tab.').'
    • +
  • '.$this->l('When you are done, click \\"Save.\\"').'
    • +
  • '.$this->l('Click on the \\"Shipping\\" tab.').'
  • '. $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.').'
    • -
  • '.$this->l('For each zone, enter a price and click "Save."').'
    • +
  • '.$this->l('For each zone, enter a price and click \\"Save.\\"').'
  • '.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'
' ); @@ -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', diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php index 3c6ddeb4b..e7192df2b 100644 --- a/controllers/admin/AdminContactsController.php +++ b/controllers/admin/AdminContactsController.php @@ -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', diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index a8bf373e4..7f06d03b1 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -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', diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 3c48841cc..eb01a3e8e 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.php @@ -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', diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 6f2bbe6e3..4e3ee8f1c 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -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( diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index d154c134a..6f3df62f1 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -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', diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 7aa90493d..b61fae1d8 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -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( diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index bc2dd2c92..21824edc2 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -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.').' -

'.$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".'), +

'.$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'), diff --git a/controllers/admin/AdminInformationController.php b/controllers/admin/AdminInformationController.php index 4b5524c11..61f09fd42 100644 --- a/controllers/admin/AdminInformationController.php +++ b/controllers/admin/AdminInformationController.php @@ -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') ); diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php index b3410093d..90cf82a73 100644 --- a/controllers/admin/AdminInvoicesController.php +++ b/controllers/admin/AdminInvoicesController.php @@ -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)) { diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index f74865cb1..57df7dfc5 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -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', diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index 52a9a8576..26849dd77 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -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.').'
'.$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.').'
'.$this->l('E-mails will be sent to the shop owner.'), 'cast' => 'intval', 'type' => 'text', 'size' => 5 diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index c0745a332..bc846734f 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -94,7 +94,7 @@ class AdminMetaControllerCore extends AdminController $robots_description .= '
'.$this->l('e.g. http://www.yoursite.com/robots.txt'); if ($this->checkConfiguration($this->rb_file)) { - $robots_description .= '
'.$this->l('Generate your "robots.txt" file by clicking on the following button (this will erase your old robots.txt file):'); + $robots_description .= '
'.$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 ), ), diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index a46fda99f..52ec138f8 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -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 = ''; diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index fabe528a6..b94518364 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -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' diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 1035af8a7..11a618c9f 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -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' diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index 1c65c012a..a29420681 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -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', diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 2334ac18f..23505df4b 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -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(' '.$this->l('How to create a new sql query?').'
    -
  • '.$this->l('Click "Add new".').'
    • -
  • '.$this->l('Fill in the fields and click "Save".').'
    • +
  • '.$this->l('Click \\"Add new\\".').'
    • +
  • '.$this->l('Fill in the fields and click \\"Save\\".').'
  • '.$this->l('You can then view the query results by clicking on the tab:').'
  • '.$this->l('You can then export the query results as CSV file by clicking on the tab:').'
@@ -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; diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index fab9370aa..decbbb45d 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -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.').'
+ $this->l('The \\"indexed\\" products have been analyzed by PrestaShop and will appear in the results of the Front Office search.').'
'.$this->l('Indexed products:').' '.(int)$indexed.' / '.(int)$total.'.

'.$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."').'

+ .$this->l('If your server stops the process before it ends, you can resume the indexation by clicking \\"Add missing products.\\"').'

-> '. $this->l('Add missing products to index.').'
-> '. @@ -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.').'
+ $this->l('The \\"weight\\" represents its importance and relevance for the ranking of the products when try a new search.').'
'.$this->l('A word with a weight of 8 will have 4 times more value than a word with a weight of 2.').'

'.$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( diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index b5d0d76e1..c4f00ae31 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -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')); diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index c81524a12..04087d793 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -1438,7 +1438,7 @@ class AdminTranslationsControllerCore extends AdminController
'; $str_return .= '
- '.$this->l('"title" tag:').' '.(isset($title['en']) ? $title['en'] : '').'
+ '.$this->l('\\"title\\" tag:').' '.(isset($title['en']) ? $title['en'] : '').'
'; $str_return .= ' diff --git a/modules/blockcontactinfos/config.xml b/modules/blockcontactinfos/config.xml index c151c04dc..d09329109 100644 --- a/modules/blockcontactinfos/config.xml +++ b/modules/blockcontactinfos/config.xml @@ -3,7 +3,7 @@ blockcontactinfos - + 1 diff --git a/modules/blocklayered/config.xml b/modules/blocklayered/config.xml index 6ba4840f1..a2a14efeb 100644 --- a/modules/blocklayered/config.xml +++ b/modules/blocklayered/config.xml @@ -8,5 +8,5 @@ 1 0 - + \ No newline at end of file diff --git a/modules/loyalty/config.xml b/modules/loyalty/config.xml index c98ec49f5..81ca85cda 100755 --- a/modules/loyalty/config.xml +++ b/modules/loyalty/config.xml @@ -7,7 +7,7 @@ Are you sure you want to delete all loyalty points and customer history? - 1 + 0 0 \ No newline at end of file