steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include locale.php, 1.7, 1.8

cvs at intevation.de cvs at intevation.de
Fri Oct 7 13:27:03 CEST 2005


Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv20889/kolab-webadmin/php/admin/include

Modified Files:
	locale.php 
Log Message:
language detection fix + integration of italian translations

Index: locale.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/locale.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- locale.php	10 Aug 2005 07:40:08 -0000	1.7
+++ locale.php	7 Oct 2005 11:27:01 -0000	1.8
@@ -69,12 +69,18 @@
 			// In case of multiple accept languages, keep the first one
 			$acceptList = explode(",", $acceptList);
 			foreach($acceptList as $l) {
+				$pos = strpos($l, ';' );
+				if( $pos !== false ) {
+				    $l = explode(';',$l);
+					$l = $l[0];
+				}
 				if( $tmp = supported_lang($l) ) {
-					$lang = $tmp;
-					break;
+				    $lang = $tmp;
+				    break;
 				}
 			}
-        }    
+        }
+		if( !$lang ) $lang = "en";
         setLanguage($lang);
     }    
     return supported_lang($_SESSION["lang"]);





More information about the commits mailing list