Removed old language handling from config object and config file

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6984 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 3998b2c6d2190cfe00e742107b591ce08a398170..e46fa23371d6cc0e563d22be2af9f76c9edd4011 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -495,16 +495,6 @@
                                password="{$cv.password}" />
                </location>
 
-               <language name="German" tag="de_DE" />
-               <language name="Russian" tag="ru_RU" />
-               <language name="Chinese" tag="zh_CN" />
-               <language name="Spanish" tag="es_ES" />
-               <language name="French" tag="fr_FR" />
-               <language name="Dutch" tag="nl_NL" />
-               <language name="English" tag="en_EN" />
-               <language name="Italian" tag="it_IT" />
-               <language name="Polish" tag="pl_PL" />
-
                <faxformat type="pdf" />
                <faxformat type="ps" />
                <faxformat type="png" />

diff --git a/include/class_config.inc b/include/class_config.inc
index 80d0105732ae20f564da8cc8dead4d12167943cc..a60ae8e243ce2ccc5f85fdd7334e7ccf0a810c9f 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -38,7 +38,7 @@ class config  {
 
   /* Configuration data */
   var $data= array( 'TABS' => array(), 'LOCATIONS' => array(), 'SERVERS' => array(),
-      'MAIN' => array( 'LANGUAGES' => array(), 'FAXFORMATS' => array() ),
+      'MAIN' => array( 'FAXFORMATS' => array() ),
       'MENU' => array(), 'SERVICE' => array());
   var $basedir= "";
 
@@ -143,15 +143,6 @@ class config  {
                   }
                   break;
 
-                  /* Handle language */
-      case 'LANGUAGE':
-                  if ($this->tags[$this->level-2] == 'MAIN'){
-                    /* Add languages */
-                    $this->data['MAIN']['LANGUAGES'][$attrs['NAME']]= 
-                      $attrs['TAG'];
-                  }
-                  break;
-
                   /* Handle faxformat */
       case 'FAXFORMAT':        
                   if ($this->tags[$this->level-2] == 'MAIN'){