Updated languages

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

diff --git a/AUTHORS b/AUTHORS
index 1af30aef69b03db1b11ac8a4284dbef2345a2312..e8c0cd9e170c62daa9ea60673be30eb1944e74d6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,6 +42,9 @@ documentation and additional help.
 * Igor Muratov <migor@altlinux.org>
   Various fixes and speed enhancements
 
+* Daniel Nylander <po@danielnylander.se>
+  Swedish translation
+
 * Michael Pasdziernik <mp@secio.de>
   Documentation for GOsa and safe-mode, fixes
 
@@ -51,6 +54,9 @@ documentation and additional help.
 * Henning Schmiedehausen <hps@intermeta.de>
   Various fixes, support for user defined people/group base
 
+* Guido Serra
+  Italian translation
+
 * Alfred Schröder <schroeder@gonicus.de>
   German translation
 

diff --git a/include/functions.inc b/include/functions.inc
index 2624017144274db1bc4438747ebde85896bf1373..8295cbcd2100949a64eabea2af81201181f4ec1e 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -189,6 +189,9 @@ function get_browser_language()
   if (preg_match('/zh/', $lang)){
     return ("zh_CN");
   }
+  if (preg_match('/sv/', $lang)){
+    return ("sv_SE");
+  }
 
   return (strtolower($lang)."_".strtoupper($lang));
 }

diff --git a/plugins/admin/systems/class_dhcpHost.inc b/plugins/admin/systems/class_dhcpHost.inc
index 12d0598c214e1c510f8a564dd14a10097953dd27..6a3092dc544429f8f6ba4e7046f5981074217eed 100644 (file)
--- a/plugins/admin/systems/class_dhcpHost.inc
+++ b/plugins/admin/systems/class_dhcpHost.inc
@@ -27,6 +27,10 @@ class dhcpHost extends plugin
   var $statements= array();
   var $dn= "new";
 
+  /* Subobjects */
+  var $network;
+  var $advanced;
+
   /* attribute list for save action */
   var $attributes= array();
   var $objectclasses= array();
@@ -65,6 +69,11 @@ class dhcpHost extends plugin
       }
 
     }
+
+    /* Load network module */
+    $this->network= new dhcpNetwork();
+    $this->network->options= $this->options;
+    $this->network->statements= $this->statements;
   }
 
   function execute()
@@ -88,7 +97,7 @@ class dhcpHost extends plugin
           "token-ring" => _("Token Ring")));
 
     /* Show main page */
-    return($smarty->fetch(get_template_path('dhcphost.tpl', TRUE)));
+    return($smarty->fetch(get_template_path('dhcphost.tpl', TRUE)).$this->network->execute());
   }
 
 

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index a4e02b704ad69358beed4682341184bd2dea4010..e24e928e034e461dc7495bbfc327e99737c7a7cc 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -265,7 +265,7 @@ class user extends plugin
                                     "de_DE" => ("de_DE"), "it_IT" => ("it_IT"), 
                                     "nl_NL" => ("nl_NL"), "ru_RU" => ("ru_RU"),
                                     "zh_CN" => ("zh_CN"), "pl_PL" => ("pl_PL"),
-                                    "sv_SV" => ("sv_SV"), "es_ES" => ("es_ES"));
+                                    "sv_SE" => ("sv_SE"), "es_ES" => ("es_ES"));
     $smarty->assign("preferredLanguage_list", $language);
 
     /* Get random number for pictures */

diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 909704f191f2d06665dc51fc4a0bdcf935851ac3..e5beae6cc741ace293ea5aaf4c73d470d6ae6146 100644 (file)
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -52,7 +52,7 @@ class Step_Language extends setup_step
                              "en_EN" => _("English"),
                              "nl_NL" => _("Dutch"),
                              "pl_PL" => _("Polish"),
-                             "sv_SV" => _("Swedish"),
+                             "sv_SE" => _("Swedish"),
                              "zh_CN" => _("Chinese"),
                              "ru_RU" => _("Russian"));
     asort($this->languages);