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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
This commit is contained in:
Jerome Nadaud committed 2013-11-18 17:21:41 +01:00
2 parents 938ef4fe39 43a54b10bf
commit c14b9e619d
4 files changed
+16 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminTranslationsController.php
+4 -3
View File
@@ -207,8 +207,8 @@ class AdminTranslationsControllerCore extends AdminController
$packs_to_update = array(); $packs_to_update = array();
$token = Tools::getAdminToken('AdminLanguages'.(int)Tab::getIdFromClassName('AdminLanguages').(int)$this->context->employee->id); $token = Tools::getAdminToken('AdminLanguages'.(int)Tab::getIdFromClassName('AdminLanguages').(int)$this->context->employee->id);
$file_name = $this->link_lang_pack.'?version='._PS_VERSION_; $file_name = $this->link_lang_pack.'?version='._PS_VERSION_;
$array_stream_context = array('http' => array('method' => 'GET', 'timeout' => 5)); $array_stream_context = @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 8)));
if ($lang_packs = Tools::file_get_contents($file_name, false, @stream_context_create($array_stream_context))) if ($lang_packs = Tools::file_get_contents($file_name, false, $array_stream_context))
// Notice : for php < 5.2 compatibility, Tools::jsonDecode. The second parameter to true will set us // Notice : for php < 5.2 compatibility, Tools::jsonDecode. The second parameter to true will set us
if ($lang_packs != '' && $lang_packs = Tools::jsonDecode($lang_packs, true)) if ($lang_packs != '' && $lang_packs = Tools::jsonDecode($lang_packs, true))
foreach ($lang_packs as $key => $lang_pack) foreach ($lang_packs as $key => $lang_pack)
@@ -768,7 +768,8 @@ class AdminTranslationsControllerCore extends AdminController
$arr_import_lang = explode('|', Tools::getValue('params_import_language')); /* 0 = Language ISO code, 1 = PS version */ $arr_import_lang = explode('|', Tools::getValue('params_import_language')); /* 0 = Language ISO code, 1 = PS version */
if (Validate::isLangIsoCode($arr_import_lang[0])) if (Validate::isLangIsoCode($arr_import_lang[0]))
{ {
$content = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/gzip/'.$arr_import_lang[1].'/'.Tools::strtolower($arr_import_lang[0]).'.gzip'); $array_stream_context = @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 10)));
$content = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/gzip/'.$arr_import_lang[1].'/'.Tools::strtolower($arr_import_lang[0]).'.gzip', false, $array_stream_context);
if ($content) if ($content)
{ {
$file = _PS_TRANSLATIONS_DIR_.$arr_import_lang[0].'.gzip'; $file = _PS_TRANSLATIONS_DIR_.$arr_import_lang[0].'.gzip';
install-dev/langs/ru/install.php
+1 -1
View File
@@ -212,7 +212,7 @@ return array(
'Contact us' => 'Свяжитесь с нами', 'Contact us' => 'Свяжитесь с нами',
'PrestaShop Installation Assistant' => 'Помощник установки PrestaShop', 'PrestaShop Installation Assistant' => 'Помощник установки PrestaShop',
'Installation Assistant' => 'Помощник установки', 'Installation Assistant' => 'Помощник установки',
'License Agreements' => 'Лицензионное соглшение', 'License Agreements' => 'Лицензионное соглашение',
'Print my login information' => 'Распечатать информацию о моем аккаунте', 'Print my login information' => 'Распечатать информацию о моем аккаунте',
'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store\'s data-related activities.' => 'Для использования PrestaShop, Вам следует <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">создать базу данных </a>, чтобы сгруппировать информацию Вашего магазина.', 'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store\'s data-related activities.' => 'Для использования PrestaShop, Вам следует <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">создать базу данных </a>, чтобы сгруппировать информацию Вашего магазина.',
'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Заполните поля ниже, чтобы PrestaShop смог установить соединение с Вашей с базой данных.', 'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Заполните поля ниже, чтобы PrestaShop смог установить соединение с Вашей с базой данных.',
modules/dashactivity/dashactivity.php
+2 -2
View File
@@ -392,14 +392,14 @@ class Dashactivity extends Module
$fields_form['form']['input'][] = array( $fields_form['form']['input'][] = array(
'label' => $this->l('Cart abandoned (min)'), 'label' => $this->l('Cart abandoned (min)'),
'desc' => $this->l('Default time range (min) to consider a Shopping cart as abandoned (default 24hrs)'), 'desc' => $this->l('Default time range (min) to consider a Shopping cart as abandoned (default 24hrs)'),
'name' => 'DASHACTIVITY_CART_ABANDONED', 'name' => 'DASHACTIVITY_CART_ABANDONED_MIN',
'type' => 'text', 'type' => 'text',
'suffix' => $this->l('hrs'), 'suffix' => $this->l('hrs'),
); );
$fields_form['form']['input'][] = array( $fields_form['form']['input'][] = array(
'label' => $this->l('Cart abandoned (max)'), 'label' => $this->l('Cart abandoned (max)'),
'desc' => $this->l('Default time range (max) to consider a Shopping cart as abandoned (default 48hrs)'), 'desc' => $this->l('Default time range (max) to consider a Shopping cart as abandoned (default 48hrs)'),
'name' => 'DASHACTIVITY_CART_ABANDONED', 'name' => 'DASHACTIVITY_CART_ABANDONED_MAX',
'type' => 'text', 'type' => 'text',
'suffix' => $this->l('hrs'), 'suffix' => $this->l('hrs'),
); );
modules/themeconfigurator/themeconfigurator.php
+9 -9
View File
@@ -344,7 +344,7 @@ class ThemeConfigurator extends Module
Configuration::updateValue('PS_QUICK_VIEW', (int)Tools::getValue('quick_view')); Configuration::updateValue('PS_QUICK_VIEW', (int)Tools::getValue('quick_view'));
foreach($this->getConfigurableModules() as $module) foreach($this->getConfigurableModules() as $module)
{ {
if (!isset($module['is_module']) || !$module['is_module'] || !Validate::isModuleName($module['name'])) if (!isset($module['is_module']) || !$module['is_module'] || !Validate::isModuleName($module['name']) || !Tools::isSubmit($module['name']))
continue; continue;
$module_instance = Module::getInstanceByName($module['name']); $module_instance = Module::getInstanceByName($module['name']);
@@ -569,37 +569,37 @@ class ThemeConfigurator extends Module
array( array(
'label' => $this->l('Display the reinsurance block'), 'label' => $this->l('Display the reinsurance block'),
'name' => 'blockreinsurance', 'name' => 'blockreinsurance',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockreinsurance')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockreinsurance')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
'label' => $this->l('Display the social following links'), 'label' => $this->l('Display the social following links'),
'name' => 'blocksocial', 'name' => 'blocksocial',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blocksocial')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blocksocial')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
'label' => $this->l('Display contact information'), 'label' => $this->l('Display contact information'),
'name' => 'blockcontactinfos', 'name' => 'blockcontactinfos',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcontactinfos')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcontactinfos')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
'label' => $this->l('Display social buttons on the products page'), 'label' => $this->l('Display social buttons on the products page'),
'name' => 'addsharethis', 'name' => 'addsharethis',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('addsharethis')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('addsharethis')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
'label' => $this->l('Display facebook block on the home page'), 'label' => $this->l('Display facebook block on the home page'),
'name' => 'blockfacebook', 'name' => 'blockfacebook',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockfacebook')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockfacebook')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
'label' => $this->l('Customer cms information block'), 'label' => $this->l('Customer cms information block'),
'name' => 'blockcmsinfo', 'name' => 'blockcmsinfo',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcmsinfo')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcmsinfo')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
@@ -610,13 +610,13 @@ class ThemeConfigurator extends Module
array( array(
'label' => $this->l('Enable top banner'), 'label' => $this->l('Enable top banner'),
'name' => 'blockbanner', 'name' => 'blockbanner',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockbanner')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockbanner')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
), ),
array( array(
'label' => $this->l('Enable product payment logos'), 'label' => $this->l('Enable product payment logos'),
'name' => 'productpaymentlogos', 'name' => 'productpaymentlogos',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('productpaymentlogos')) && $module->active), 'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('productpaymentlogos')) && $module->isEnabledForShopContext()),
'is_module' => true, 'is_module' => true,
) )
); );