From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Tue, 6 Sep 2005 17:02:19 +0000 (+0000)
Subject: * Pluralform => Plural
X-Git-Tag: 1.6.0~1708
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=c62b79d3e32044986f204b1c5597d0ba619088ac;p=lhc%2Fweb%2Fwiklou.git

* Pluralform => Plural
---

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index db34f25f5d..7d2b8f5646 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -56,7 +56,7 @@ define('MAG_SCRIPTPATH',		41);
 define('MAG_SERVERNAME',		42);
 define('MAG_NUMBEROFFILES',		43);
 define('MAG_IMG_MANUALTHUMB',		44);
-define('MAG_PLURALFORM',		45);
+define('MAG_PLURAL',			45);
 
 $wgVariableIDs = array(
 	MAG_CURRENTMONTH,
diff --git a/includes/Parser.php b/includes/Parser.php
index 1914613a71..df2743221e 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2174,12 +2174,12 @@ class Parser
 			}
 		}
 
-		# PLURALFORM
+		# PLURAL
 		if ( !$found && $argc >= 2 ) {
-			$mwPluralForm =& MagicWord::get( MAG_PLURALFORM );
+			$mwPluralForm =& MagicWord::get( MAG_PLURAL );
 			if ( $mwPluralForm->matchStartAndRemove( $part1 ) ) {
 				if ($argc==2) {$args[2]=$args[1];}
-				$text = $linestart . $wgContLang->convertPluralForm( $part1, $args[0], $args[1], $args[2]);
+				$text = $linestart . $wgContLang->convertPlural( $part1, $args[0], $args[1], $args[2]);
 				$found = true;
 			}
 		}
diff --git a/languages/Language.php b/languages/Language.php
index 795d801cff..b39f076217 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -233,7 +233,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 	MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK'            ),
 	MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
 	MAG_REVISIONID           => array( 1,    'REVISIONID'             ),
-	MAG_PLURALFORM           => array( 0,    'PLURALFORM:'            ),
+	MAG_PLURAL               => array( 0,    'PLURAL:'                ),
 );
 
 #-------------------------------------------------------------------
@@ -2789,10 +2789,10 @@ class Language {
 	 * depending on "count mod 10". See [[w:Plural]]
 	 * For English it is pretty simple.
 	 *
-	 * Invoked by putting {{pluralform:count|wordform1|wordform2}}
-	 * or {{pluralform:count|wordform1|wordform2|wordform3}}
+	 * Invoked by putting {{plural:count|wordform1|wordform2}}
+	 * or {{plural:count|wordform1|wordform2|wordform3}}
 	 *
-	 * Example: {{pluralform:{{NUMBEROFARTICLES}}|article|articles}} 
+	 * Example: {{plural:{{NUMBEROFARTICLES}}|article|articles}} 
 	 *
 	 * @param string $count
 	 * @param string $wordform1
@@ -2800,9 +2800,8 @@ class Language {
 	 * @param string $wordform3 (optional)
 	 * @return string
 	 */
-	function convertPluralForm( $count, $wordform1, $wordform2, $wordform3) {
-		if ($count==1) {return $wordform1;}
-		else {return $wordform2;}
+	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
+		return $count == 1 ? $wordform1 : $wordform2;
 	}
 
 	/**
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 2454cca1cf..777a47f189 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -2000,7 +2000,7 @@ class LanguageRu extends LanguageUtf8 {
 		return $word;
 	}
 
-	function convertPluralForm( $count, $wordform1, $wordform2, $wordform3) {
+	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
 		if ($count > 10 && floor(($count % 100) / 10) == 1) {
 			return $wordform3;
 		}