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

[-] BO: Fix error message for new language creation and iso code not exists

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-02-05 16:33:29 +01:00
1 parent 89fba01aa1
commit 61265e587f
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLanguagesController.php
+6 -3
View File
@@ -488,8 +488,8 @@ class AdminLanguagesControllerCore extends AdminController
{ {
// Get all iso code available // Get all iso code available
$lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.(string)$_GET['ps_version'].'&iso_lang='.(string)$_GET['iso_lang']); $lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.(string)$_GET['ps_version'].'&iso_lang='.(string)$_GET['iso_lang']);
$result = Tools::jsonDecode($lang_packs);
if ($lang_packs !== '' && Tools::jsonDecode($lang_packs) !== null) if ($lang_packs !== '' && $result && !isset($result->error))
{ {
$this->status = 'ok'; $this->status = 'ok';
$this->content = $lang_packs; $this->content = $lang_packs;
@@ -497,7 +497,10 @@ class AdminLanguagesControllerCore extends AdminController
else else
{ {
$this->status = 'error'; $this->status = 'error';
$this->errors[] = $this->l('Wrong ISO code, or the selectec language pack is unavailable.'); $msg = $this->l('Wrong ISO code, or the selected language pack is unavailable.');
if ($result)
$msg = $result->msg;
$this->errors[] = $msg;
} }
} }
else else