From 801b73055edf7dc643254a7806f313d18965d79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 5 Feb 2013 16:33:29 +0100
Subject: [PATCH] [-] BO: Fix error message for new language creation and iso
 code not exists

---
 controllers/admin/AdminLanguagesController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index f9689f2cf..11ce73750 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -488,8 +488,8 @@ class AdminLanguagesControllerCore extends AdminController
 		{
 			// 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']);
-			
-			if ($lang_packs !== '' && Tools::jsonDecode($lang_packs) !== null)
+			$result = Tools::jsonDecode($lang_packs);
+			if ($lang_packs !== '' && $result && !isset($result->error))
 			{
 				$this->status = 'ok';
 				$this->content = $lang_packs;
@@ -497,7 +497,10 @@ class AdminLanguagesControllerCore extends AdminController
 			else
 			{
 				$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