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

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

Browse Source
This commit is contained in:
vAugagneur
2013-03-11 15:10:27 +01:00
parent 0688061b0a 8625f39c07
commit fd6540b896
2 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/LocalizationPack.php
+5 -14
View File
@@ -292,20 +292,15 @@ class LocalizationPackCore
foreach ($xml->languages->language as $data) foreach ($xml->languages->language as $data)
{ {
$attributes = $data->attributes(); $attributes = $data->attributes();
if (Language::getIdByIso($attributes['iso_code']))
continue;
$native_lang = Language::getLanguages();
$native_iso_code = array();
foreach ($native_lang as $lang)
$native_iso_code[] = $lang['iso_code'];
// if we are not in an installation context or if the pack is not available in the local directory // if we are not in an installation context or if the pack is not available in the local directory
if (!$install_mode || !in_array((string)$attributes['iso_code'], $native_iso_code)) if (Language::getIdByIso($attributes['iso_code']) && !$install_mode)
{ continue;
$errno = 0; $errno = 0;
$errstr = ''; $errstr = '';
if (!@fsockopen('api.prestashop.com', 80, $errno, $errstr, 5)) if (!$lang_pack_link = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='._PS_VERSION_.'&iso_lang='.$attributes['iso_code']))
$this->_errors[] = Tools::displayError('Archive cannot be downloaded from prestashop.com.'); $this->_errors[] = Tools::displayError('Archive cannot be downloaded from prestashop.com.');
elseif (!($lang_pack = Tools::jsonDecode(Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='._PS_VERSION_.'&iso_lang='.$attributes['iso_code'])))) elseif (!$lang_pack = Tools::jsonDecode($lang_pack_link))
$this->_errors[] = Tools::displayError('Error occurred when language was checked according to your Prestashop version.'); $this->_errors[] = Tools::displayError('Error occurred when language was checked according to your Prestashop version.');
elseif ($content = Tools::file_get_contents('http://translations.prestashop.com/download/lang_packs/gzip/'.$lang_pack->version.'/'.$attributes['iso_code'].'.gzip')) elseif ($content = Tools::file_get_contents('http://translations.prestashop.com/download/lang_packs/gzip/'.$lang_pack->version.'/'.$attributes['iso_code'].'.gzip'))
{ {
@@ -325,21 +320,17 @@ class LocalizationPackCore
AdminTranslationsController::checkAndAddMailsFiles($attributes['iso_code'], $files_list); AdminTranslationsController::checkAndAddMailsFiles($attributes['iso_code'], $files_list);
AdminTranslationsController::addNewTabs($attributes['iso_code'], $files_list); AdminTranslationsController::addNewTabs($attributes['iso_code'], $files_list);
} }
if (!Language::checkAndAddLanguage((string)$attributes['iso_code'])) if (!Language::checkAndAddLanguage((string)$attributes['iso_code']))
{ {
$this->_errors[] = Tools::displayError('An error occurred while creating the language: ').(string)$attributes['iso_code']; $this->_errors[] = Tools::displayError('An error occurred while creating the language: ').(string)$attributes['iso_code'];
return false; return false;
} }
@unlink($file); @unlink($file);
} }
else else
$this->_errors[] = Tools::displayError('Server does not have permissions for writing.'); $this->_errors[] = Tools::displayError('Server does not have permissions for writing.');
} }
} }
}
// change the default language if there is only one language in the localization pack // change the default language if there is only one language in the localization pack
if (!count($this->_errors) && $install_mode && isset($attributes['iso_code']) && count($xml->languages->language) == 1) if (!count($this->_errors) && $install_mode && isset($attributes['iso_code']) && count($xml->languages->language) == 1)
$this->iso_code_lang = $attributes['iso_code']; $this->iso_code_lang = $attributes['iso_code'];
controllers/front/OrderOpcController.php
+1 -1
View File
@@ -455,7 +455,7 @@ class OrderOpcControllerCore extends ParentOrderController
$minimalPurchase = Tools::convertPrice((float)Configuration::get('PS_PURCHASE_MINIMUM'), $currency); $minimalPurchase = Tools::convertPrice((float)Configuration::get('PS_PURCHASE_MINIMUM'), $currency);
if ($this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS) < $minimalPurchase) if ($this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS) < $minimalPurchase)
return '<p class="warning">'.sprintf( return '<p class="warning">'.sprintf(
Tools::displayError('A minimum purchase total of %d is required in order to validate your order.'), Tools::displayError('A minimum purchase total of %s is required in order to validate your order.'),
Tools::displayPrice($minimalPurchase, $currency) Tools::displayPrice($minimalPurchase, $currency)
).'</p>'; ).'</p>';