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 5be46dbec0257f8f61b74fc9fac7aae259f78074..a4fec5c67ea4dfae6f6d8a1fc6a4a922cb96df99 100644 (file)
--- 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 621863cb1a9e9c956643d783a5b352dc36baaf97..adb5c1d3018939ffed7347513c0bd3003273393f 100644 (file)
--- 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);