Removed gosa stuff from external code.

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

diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index a108cc21c044f5968e87f32f042dde8ec372efc5..52647c6606ece6f98932726eaa88c394c248a2b4 100644 (file)
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -87,14 +87,6 @@ function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
 function al2gt($gettextlangs, $mime) 
 {
 
-  /* Try to use users primary language */
-  $ui= get_userinfo();
-  if ($ui != NULL){
-    if ($ui->language != ""){
-      return ($ui->language.".UTF-8");
-    }
-  }
-
   /* default to "everything is acceptable", as RFC2616 specifies */
   $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
     $_SERVER["HTTP_ACCEPT_LANGUAGE"]);

diff --git a/include/functions.inc b/include/functions.inc
index be17de81fe9af4635bfeefddf00f4d266d4256bb..5358c6f097ac7d0a780ecc27bff3e7a487ee3b0a 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -149,6 +149,14 @@ function DEBUG($level, $line, $function, $file, $data, $info="")
 
 function get_browser_language()
 {
+  /* Try to use users primary language */
+  $ui= get_userinfo();
+  if ($ui != NULL){
+    if ($ui->language != ""){
+      return ($ui->language.".UTF-8");
+    }
+  }
+
   /* Load supported languages */
   $gosa_languages= get_languages();