[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21636] trunk/lib

[<lph...@us...>]

Revision: 21636
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21636&view=rev
Author:   lphuberdeau
Date:     2009-09-21 15:37:56 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
[NEW] Language inclusion threshold to prevent asking all users to specify languages when the site only supports a small number of languages

Modified Paths:
--------------
    trunk/lib/multilingual/multilinguallib.php
    trunk/lib/setup/prefs.php

Modified: trunk/lib/multilingual/multilinguallib.php
===================================================================
--- trunk/lib/multilingual/multilinguallib.php	2009-09-21 15:29:01 UTC (rev 21635)
+++ trunk/lib/multilingual/multilinguallib.php	2009-09-21 15:37:56 UTC (rev 21636)
@@ -271,12 +271,19 @@
 			if (!in_array($l, $langs))
 				$langs[] = $l;
 		}
+
+		if( $prefs['available_languages'] && $prefs['language_inclusion_threshold'] >= count($prefs['available_languages']) ) {
+			foreach( array_diff( $prefs['available_languages'], $langs ) as $lang ) {
+				$langs[] = $lang;
+			}
+		}
+
 		return $langs;	
 	}
 	/* @brief : return the root language ex: en-uk returns en
 	 */
 	function rootLang($lang) {
-		return ereg_replace("(.*)-(.*)", "\\1", $lang);
+		return preg_replace("/(.*)-(.*)/", '$1', $lang);
 	}
 
 	/* @brief : fitler a list of object to have only one objet in the set of translations with the best language

Modified: trunk/lib/setup/prefs.php
===================================================================
--- trunk/lib/setup/prefs.php	2009-09-21 15:29:01 UTC (rev 21635)
+++ trunk/lib/setup/prefs.php	2009-09-21 15:37:56 UTC (rev 21636)
@@ -1033,6 +1033,7 @@
 		'quantify_changes' => 'n',
 		'feature_sync_language' => 'n',
 		'show_available_translations' =>'y',
+		'language_inclusion_threshold' => 0,
 
 		// html header
 		'metatag_keywords' => '',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.