From 720b7f14cc8604f1b646b227dda09c42d5c68dd8 Mon Sep 17 00:00:00 2001 From: ovclas Date: Wed, 24 Aug 2011 06:11:18 +0000 Subject: [PATCH] issue 70 multilingual admin devlopement. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8856 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.controller.php | 12 ++++++------ modules/module/module.admin.view.php | 22 ---------------------- modules/module/tpl/module_langcode.html | 21 +++++++++------------ 3 files changed, 15 insertions(+), 40 deletions(-) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index ccf137b92..e57461674 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -438,12 +438,12 @@ foreach($lang_supported as $key => $val) { $args->lang_code = $key; $args->value = trim(Context::get($key)); - if(!$args->value) { - $args->value = Context::get(strtolower($key)); - if(!$args->value) $args->value = $args->name; - } - $output = executeQuery('module.insertLang', $args); - if(!$output->toBool()) return $output; + + if($args->value) + { + $output = executeQuery('module.insertLang', $args); + if(!$output->toBool()) return $output; + } } $this->makeCacheDefinedLangCode($args->site_srl); diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 2223d70d3..55e858b78 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -174,28 +174,6 @@ $this->setTemplateFile('module_grant_setup'); } - /** - * @brief Language codes - **/ - /*function dispModuleAdminLangcode() { - // Get the language file of the current site - $site_module_info = Context::get('site_module_info'); - $args->site_srl = (int)$site_module_info->site_srl; - $args->sort_index = 'name'; - $args->order_type = 'asc'; - $output = executeQueryArray('module.getLangList', $args); - Context::set('lang_list', $output->data); - // Get the currently selected language - $name = Context::get('name'); - if($name) { - $oModuleAdminModel = &getAdminModel('module'); - Context::set('selected_lang', $oModuleAdminModel->getLangCode($args->site_srl,'$user_lang->'.$name)); - } - // Set the layout to be pop-up - $this->setLayoutFile('popup_layout'); - // Set a template file - $this->setTemplateFile('module_langcode'); - }*/ /** * @brief Language codes diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html index 127b426b3..fe58c7d59 100644 --- a/modules/module/tpl/module_langcode.html +++ b/modules/module/tpl/module_langcode.html @@ -30,18 +30,15 @@