[php-blog-cvs] serendipity serendipity_lang.inc.php,1.2,1.3

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv28262

Modified Files:
	serendipity_lang.inc.php 
Log Message:
Only auto-guess if we were unable to include to configured language

Still fall back to english in the end


Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang.inc.php	7 Sep 2003 21:33:53 -0000	1.2
+++ serendipity_lang.inc.php	7 Sep 2003 21:41:00 -0000	1.3
@@ -3,26 +3,29 @@
 
 if (serendipity_LANG_LOADED !== true) {
     
-    // Try and include preferred language from configurated options
+    // Try and include preferred language from configurated setting
     if ( @include_once('serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) { 
         // Only here can we truely say the language is loaded
         define('serendipity_LANG_LOADED', true);
-        break;
-    }
+    
+    
+    } else {   /* -- Auto-Guess -- */
+        
+        // If no config file is loaded, language includes are not available.
+        // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
+        $supported_languages = array('en', 'de');
+        $possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+        if (is_array($possible_languages)) {
+            foreach($possible_languages as $index => $lang) {
+                $preferred_language = preg_replace('|^([^\-_]*)|msU', '\1', $lang);
+                if (in_array($preferred_language, $supported_languages)) {
+                    include_once('serendipity_lang_' . $preferred_language . '.inc.php');
+                    break;
+                } // endif
+            } // endforeach
+        } // endif
+    }  //endif
 
-    // If no config file is loaded, language includes are not available.
-    // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
-    $supported_languages = array('en', 'de');
-    $possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-    if (is_array($possible_languages)) {
-        foreach($possible_languages as $index => $lang) {
-            $preferred_language = preg_replace('|^([^\-_]*)|msU', '\1', $lang);
-            if (in_array($preferred_language, $supported_languages)) {
-                include_once('serendipity_lang_' . $preferred_language . '.inc.php');
-                break;
-            }
-        }
-    }
     
     // Add fallback to english
     include_once('serendipity_lang_en.inc.php');