Changeset 9070 for extensions/ContactForm/classes

Timestamp:

Feb 3, 2011, 12:47:28 AM (13 years ago)

Author:

plg

Message:

feature 2180: remove the localization configuration tab

Location:

extensions/ContactForm/classes

Files:

• cf_config.class.php (modified) (5 diffs)
• cf_config_lang.class.php (deleted)
• cf_plugin.class.php (modified) (3 diffs)

extensions/ContactForm/classes/cf_config.class.php

@@ -11 +11 @@
   protected $db_key = null;
   protected $db_comment = null;
-  protected $config_lang;
   
   /* ************************ */
@@ -39 +38 @@
   }
   
-  function get_config_lang() {
-    return $this->config_lang;
-  }
-  
-  function get_lang_value($item, $language=null) {
-    if (null == $language) {
-      global $user;
-      $language = $user['language'];
-    }
-    $value = $this->config_lang->get_value($language, $item);
-    if (empty($value)) {
-      cf_switch_to_default_lang();
-      $value = l10n($item);
-      cf_switch_back_to_user_lang();
-    }
-    return $value;
-  }
-  
   /* ************************ */
   /* ** Loading methods    ** */
@@ -62 +43 @@
   
   function load_config() {
-    $this->config_lang = null;
     if (null != $this->db_key) {
       $query = '
@@ -74 +54 @@
         if(is_string($row[0])) {
           $this->config_values = unserialize($row[0]);
-          if (isset($this->config_values['config_lang'])) {
-            $this->config_lang = $this->config_values['config_lang'];
-            $this->config_values['config_lang'] = null;
-          }
         }
       }
     }
-//    CF_Log::add_debug($this->config_lang, 'CF_Config::load_config');
     $this->load_default_config();
   }
   
   protected function load_default_config() {
-    if (null == $this->config_lang) {
-      $this->config_lang = new CF_Config_Lang();
-      $this->config_values['config_lang'] = null;
-      CF_Log::add_debug($this->config_lang,'CF_Config::load_default_config');
-    }
-    $this->config_lang->set_default_values();
-    $this->config_lang->update_keys();
     foreach (CF_Config::$default_config as $key => $value) {
       if (!isset($this->config_values[$key])) {
@@ -108 +76 @@
       return false;
     }
-    $this->config_values['config_lang'] = $this->config_lang;
+
+    unset($this->config_values['config_lang']);
+    
     if (!isset($this->config_values[CF_CFG_COMMENT])) {
       $this->set_value(CF_CFG_COMMENT, CF_CFG_DB_COMMENT);

extensions/ContactForm/classes/cf_plugin.class.php

@@ -53 +53 @@
     
     $cf_values = array(
-        'TEXT'  => $this->config->get_lang_value('contact_form_link'),
+        'TEXT'  => l10n('contact_form_link'),
         'URL'   => make_index_url(array('section' => CF_URL_PARAMETER)),
       );
@@ -75 +75 @@
     if (!isset($block_mbMenu->data[CF_MENUBAR_KEY])) {
       $contact_form_menu = array(
-          'TITLE' => $this->config->get_lang_value('contact_form_title'),
-          'NAME'  => $this->config->get_lang_value('contact_form'),
+          'TITLE' => l10n('contact_form_title'),
+          'NAME'  => l10n('contact_form'),
           'URL'   => make_index_url(array('section' => CF_URL_PARAMETER)),
         );
@@ -165 +165 @@
     global $template;
     $cf_link = array(
-        'TEXT'  => $this->config->get_lang_value('contact_form_link'),
+        'TEXT'  => l10n('contact_form_link'),
         'URL'   => make_index_url(array('section' => CF_URL_PARAMETER)),
       );