From: Shinjiman <shinjiman@users.mediawiki.org>
Date: Fri, 22 May 2009 21:24:16 +0000 (+0000)
Subject: some more tweaks
X-Git-Tag: 1.31.0-rc.0~41686
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=14aed21d2e173b562cfad4f19b602f5ccfb33fb9;p=lhc%2Fweb%2Fwiklou.git

some more tweaks
---

diff --git a/maintenance/language/checkDupeMessages.php b/maintenance/language/checkDupeMessages.php
index 3ad28d3fd5..a4898afa26 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -40,10 +40,12 @@ END;
 
 // Check file exists
 if ( $runTest ) {
-	$langCode = ucfirst(strtolower(preg_replace('/-/','_',$options['lang'])));
-	$langCodeC = ucfirst(strtolower(preg_replace('/-/','_',$options['clang'])));
-	$messagesFile = $messagesDir.'Messages'.$langCode.'.php';
-	$messagesFileC = $messagesDir.'Messages'.$langCodeC.'.php';
+	$langCode = $options['lang'];
+	$langCodeC = $options['clang'];
+	$langCodeF = ucfirst(strtolower(preg_replace('/-/','_',$langCode)));
+	$langCodeFC = ucfirst(strtolower(preg_replace('/-/','_',$langCodeC)));
+	$messagesFile = $messagesDir.'Messages'.$langCodeF.'.php';
+	$messagesFileC = $messagesDir.'Messages'.$langCodeFC.'.php';
 	if (file_exists($messagesFile) && file_exists($messagesFileC)) {
 		$run = true;
 	}
@@ -68,7 +70,7 @@ if ( $run ) {
 	foreach ($wgMessages[$langCodeC] as $key => $value) {
 		foreach ($wgMessages[$langCode] as $ckey => $cvalue) {
 			if (!strcmp($key,$ckey)) {
-				if (!strcmp($value,$cvalue)) {
+				if ((!strcmp($key,$ckey)) && (!strcmp($value,$cvalue))) {
 					if (!strcmp($runMode,'raw')) {
 						print("$key\n");
 					} else if (!strcmp($runMode,'wiki')) {
@@ -84,9 +86,9 @@ if ( $run ) {
 	}
 	if (!strcmp($runMode,'text')) {
 		if ($count == 1) {
-			echo "\nThere are $count duplicated message in ".$options['lang'].", against to ".$options['clang'].".\n";
+			echo "\nThere are $count duplicated message in $langCode, against to $langCodeC.\n";
 		} else {
-			echo "\nThere are $count duplicated messages in ".$options['lang'].", against to ".$options['clang'].".\n";
+			echo "\nThere are $count duplicated messages in $langCode, against to $langCodeC.\n";
 		}
 	}	
 }