From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 1 Dec 2004 01:22:36 +0000 (+0000)
Subject: (bug 961) Treat languages without names more cleanly
X-Git-Tag: 1.5.0alpha1~1185
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=be3953d479521d97686cf94ca3a924d3301ebff1;p=lhc%2Fweb%2Fwiklou.git

(bug 961) Treat languages without names more cleanly
---

diff --git a/config/index.php b/config/index.php
index 96e7a23a1b..67e8789111 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1044,11 +1044,16 @@ function getLanguageList() {
 	while( false !== ($f = readdir( $d ) ) ) {
 		if( preg_match( '/Language([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
 			$code = str_replace( '_', '-', strtolower( $m[1] ) );
+			if( isset( $wgLanguageNames[$code] ) ) {
+				$name = $code . ' - ' . $wgLanguageNames[$code];
+			} else {
+				$name = $code;
+			}
 			if( in_array( $code, $latin1 ) ) {
-				$codes[$code] = "$code - " . $wgLanguageNames[$code] . " - Unicode";
-				$codes[$code.'-latin1'] = "$code - " . $wgLanguageNames[$code] . " - Latin-1";
+				$codes[$code] = $name . " - Unicode";
+				$codes[$code.'-latin1'] = $name . " - Latin-1";
 			} else {
-				$codes[$code] = "$code - " . $wgLanguageNames[$code];
+				$codes[$code] = $name;
 			}
 		}
 	}