From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 5 Dec 2007 10:37:14 +0000 (+0000)
Subject: Updated language detection
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=87f8edde74e5f55fff922e11e28a264bbb34f0ac;p=gosa.git

Updated language detection


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

diff --git a/html/index.php b/html/index.php
index 5be46dbec..a4fec5c67 100644
--- a/html/index.php
+++ b/html/index.php
@@ -379,6 +379,7 @@ if ($error_collector != ""){
 displayLogin();
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+
 ?>
 
 </body>
diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index 621863cb1..adb5c1d30 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -97,11 +97,14 @@ function al2gt($gettextlangs, $mime)
   /* default to "everything is acceptable", as RFC2616 specifies */
   $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
     $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
+  /* Commented out due to problems with IE7, defaulting to the one below... */
+  #$acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
+  #  $_SERVER["HTTP_ACCEPT_CHARSET"]);
+  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? 'ISO-8859-1,utf-8;q=0.7,*;q=0.7' :
     $_SERVER["HTTP_ACCEPT_CHARSET"]);
   $alparts=@preg_split("/,/",$acceptLang);
   $acparts=@preg_split("/,/",$acceptChar);
-  
+
   /* Parse the contents of the Accept-Language header.*/
   foreach($alparts as $part) {
     $part=trim($part);