// revert to revision 14160

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
+1 -1
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/'))
{
+13 -13
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',
@@ -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',
@@ -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',
@@ -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',
@@ -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(
@@ -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',
+2 -2
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(
+1 -1
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'),
@@ -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')
);
@@ -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))
{
@@ -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',
+1 -1
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
+3 -3
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
),
),
+1 -1
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 = '';
@@ -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'
@@ -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'
@@ -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',
@@ -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;
@@ -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(
+2 -2
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'));
@@ -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 .= '