[php-blog-cvs] serendipity serendipity_lang.inc.php,1.13,1.14 NEWS,1.160,1.161

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1359

Modified Files:
	serendipity_lang.inc.php NEWS 
Log Message:
updated language selection to Dutch and Portuguese.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- NEWS	23 Jun 2004 11:42:41 -0000	1.160
+++ NEWS	1 Jul 2004 11:34:20 -0000	1.161
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Added dutch and portugues language. Thanks to Paul de Bruyne and
+      Ranulfo Netto!
+
     * Multi User: Fixed bug #977695 where simple editors couldn't re-edit 
       their entries (garvinhicking)
 

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang.inc.php	11 Jun 2004 21:49:15 -0000	1.13
+++ serendipity_lang.inc.php	1 Jul 2004 11:34:06 -0000	1.14
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2)');
+define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian');
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting
@@ -11,11 +11,11 @@
         // 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.
         $serendipty['autolang'] = 'en';
-        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr');
+        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt');
         $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {
-                $preferred_language = preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang);
+                $preferred_language = strtolower(preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang));
                 if (in_array($preferred_language, $supported_languages)) {
                     @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
                     $serendipity['autolang'] = $preferred_language;