[Tikiwiki-cvs] tiki/lib tikilib.php,1.196.2.30,1.196.2.31

[<gim...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv13222/lib

Modified Files:
      Tag: release_eta_carinea_rc1
	tikilib.php 
Log Message:
I'm moving my changes to the trunk.


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.196.2.30
retrieving revision 1.196.2.31
diff -u -d -r1.196.2.30 -r1.196.2.31
--- tikilib.php	3 Aug 2003 15:55:06 -0000	1.196.2.30
+++ tikilib.php	4 Aug 2003 23:28:19 -0000	1.196.2.31
@@ -4315,78 +4315,21 @@
 
     return sprintf("%s%02d%s%02d", $sign, $mins / 60, $colon, $mins % 60);
   }
-  
-  function list_languages($path = false) {
-    $languages=Array();
-    if (!$path) $path = "lang";
-    if (!is_dir($path)) return array();
-    $h=opendir($path);
-    while($file=readdir($h)) {
-      if($file!='.' && $file!='..' && is_dir("$path/$file") && strlen($file)==2) {
-        $languages[]=$file;
-      }
-    }
-    closedir($h);
-
-    // Format and return the list
-    return $this->format_language_list($languages);
-  }
 
-  // Returns a list of languages formatted as a twodimensionel array
-  // with 'value' being the language code and 'name' being the name of
-  // the language.
-  function format_language_list($languages) {
-
-    // Comparison function used to sort languages by their name in the
-    // current locale.
-    function formatted_language_compare($a, $b) {
-      return strcmp($a['name'], $b['name']);
-    }
-
-    // The list of available languages so far with both English and
-    // translated names.
-    $mapping = Array('cs' => Array('Czech', tra("Czech")),
-                     'da' => Array('Danish', tra("Danish")),
-                     'de' => Array('German', tra("German")),
-                     'en' => Array('English', tra("English")),
-                     'es' => Array('Spanish', tra("Spanish")),
-                     'el' => Array('Greek', tra("Greek")),
-                     'fr' => Array('French', tra("French")),
-                     'it' => Array('Italian', tra("Italian")), 
-                     'nl' => Array('Dutch', tra("Dutch")),
-                     'no' => Array('Norwegian', tra("Norwegian")),
-                     'pl' => Array('Polish', tra("Polish")),
-                     'ru' => Array('Russian', tra("Russian")),
-                     'es' => Array('Spanish', tra("Spanish")), 
-                     'sv' => Array('Swedish', tra("Swedish")),
-                     'tw' => Array('Twi', tra("Twi")),
-                     'zh' => Array('Chinese', tra("Chinese")));
-
-    $formatted = Array();
-    // run through all the language codes:
-    foreach ($languages as $lc) {
-      if (isset($mapping[$lc])) {
-        // known language
-        if ($mapping[$lc][0] == $mapping[$lc][1]) {
-          // Skip repeated text, 'English (English, en)' looks silly.
-          $formatted[] = Array('value' => $lc,
-                               'name' => $mapping[$lc][0] . " ($lc)");
-        } else {
-          $formatted[] = Array('value' => $lc,
-                               'name' => $mapping[$lc][1] .
-                               ' (' . $mapping[$lc][0] . ', ' . $lc . ')');
-        }
-      } else {
-        // unknown language
-        $formatted[] = Array('value' => $lc,
-                             'name' => tra("Unknown language") . " ($lc)");
-      }
-    }
-
-    // Sort the languages by their name in the current locale
-    usort($formatted, 'formatted_language_compare');
-    return $formatted;
-  }
+	function list_languages($path = false) {
+		$languages=Array();
+		if (!$path) $path = "lang";
+		if (!is_dir($path)) return array();
+		$h=opendir($path);
+		while($file=readdir($h)) {
+			if($file!='.' && $file!='..' && is_dir("$path/$file") && strlen($file)==2) {
+				$languages[]=$file;
+			}
+		}
+		closedir($h);
+		sort($languages);
+		return $languages;
+	}
 
   function get_language($user = false) {
     static $language = false;