diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
index 1c3d1bf46..597b18cc2 100644
--- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
@@ -25,10 +25,14 @@
*}
{extends file="helpers/form/form.tpl"}
-{block name="start_field_block"}
-
+{block name="input_block"}
{if $input.type == 'special'}
-
{$input.text}
+
+
{$input.text}
+
+
+ {else}
+ {$smarty.block.parent}
{/if}
{/block}
diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index a540da2a3..a7019b2f2 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -122,7 +122,7 @@ class AdminLanguagesControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Name:'),
'name' => 'name',
- 'size' => 8,
+ 'size' => 32,
'maxlength' => 32,
'required' => true
),
@@ -131,7 +131,7 @@ class AdminLanguagesControllerCore extends AdminController
'label' => $this->l('ISO code:'),
'name' => 'iso_code',
'required' => true,
- 'size' => 4,
+ 'size' => 2,
'maxlength' => 2,
'desc' => $this->l('2-letter ISO code (e.g., fr, en, de)')
),
@@ -140,7 +140,7 @@ class AdminLanguagesControllerCore extends AdminController
'label' => $this->l('Language code:'),
'name' => 'language_code',
'required' => true,
- 'size' => 10,
+ 'size' => 2,
'maxlength' => 5,
'desc' => $this->l('Full language code (e.g., en-us, pt-br)')
),
diff --git a/css/admin.css b/css/admin.css
index b06902626..5d2ff0582 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -983,7 +983,7 @@ p.fail{
font-weight:bold;
color:red;
}
-#resultCheckLangPack{
+#lang_pack_msg {
border: 1px solid #DFD5C3;
padding:10px;
margin-bottom:10px;
diff --git a/js/checkLangPack.js b/js/checkLangPack.js
index 86d2b03cc..350e377b3 100644
--- a/js/checkLangPack.js
+++ b/js/checkLangPack.js
@@ -27,6 +27,8 @@
function checkLangPack(token){
if ($('#iso_code').val().length == 2)
{
+ $('#lang_pack_loading').show();
+ $('#lang_pack_msg').hide();
doAdminAjax(
{
controller:'AdminLanguages',
@@ -38,6 +40,7 @@ function checkLangPack(token){
},
function(ret)
{
+ $('#lang_pack_loading').hide();
ret = $.parseJSON(ret);
if( ret.status == 'ok')
{
@@ -46,7 +49,8 @@ function checkLangPack(token){
+'
' + langPackVersion + ' ' + content['version']
+ '
'+download+'' + langPackInfo;
- showSuccessMessage(message);
+ $('#lang_pack_msg').html(message);
+ $('#lang_pack_msg').show();
}
else
showErrorMessage(ret.error);