From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Tue, 20 Nov 2007 18:17:40 +0000 (+0000)
Subject: * Support {{PLURAL}} for import log
X-Git-Tag: 1.31.0-rc.0~50776
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=402149db80ef3d60da44cb68b20223e4e169697a;p=lhc%2Fweb%2Fwiklou.git

* Support {{PLURAL}} for import log
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4be0590e95..8e674d80aa 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -178,7 +178,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   rather than an "Internal Server Error").
 * Do not present an image bigger than the source when 'frameless' option is used
   (to be consistent with the 'thumb' option now)
-
+* Support {{PLURAL}} for import log
+  
 == Parser changes in 1.12 ==
 
 The parser pass order has changed from
diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index ad5d8e64a7..64aa4cbc47 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -193,13 +193,13 @@ class ImportReporter {
 		if( $successCount > 0 ) {
 			$log = new LogPage( 'import' );
 			if( $this->mIsUpload ) {
-				$detail = wfMsgForContent( 'import-logentry-upload-detail',
+				$detail = wfMsgExt( 'import-logentry-upload-detail', array( 'content', 'parsemag' ),
 					$contentCount );
 				$log->addEntry( 'upload', $title, $detail );
 			} else {
 				$interwiki = '[[:' . $this->mInterwiki . ':' .
 					$origTitle->getPrefixedText() . ']]';
-				$detail = wfMsgForContent( 'import-logentry-interwiki-detail',
+				$detail = wfMsgExt( 'import-logentry-interwiki-detail', array( 'content', 'parsemag' ),
 					$contentCount, $interwiki );
 				$log->addEntry( 'interwiki', $title, $detail );
 			}
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 107110a52a..87c09cacff 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1827,10 +1827,10 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 # Import log
 'importlogpage'                    => 'Import-Logbuch',
 'importlogpagetext'                => 'Administrativer Import von Seiten mit Versionsgeschichte von anderen Wikis.',
-'import-logentry-upload'           => 'hat „[[$1]]“ importiert',
-'import-logentry-upload-detail'    => '{{PLURAL:$1|1 Version|$1 Versionen}}',
+'import-logentry-upload'           => 'hat „[[$1]]“ von einer Datei importiert',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|Version|Versionen}}',
 'import-logentry-interwiki'        => 'hat „[[$1]]“ importiert (Transwiki)',
-'import-logentry-interwiki-detail' => '$1 Version(en) von $2',
+'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|Version|Versionen}} von $2',
 
 # Tooltip help for the actions
 'tooltip-pt-userpage'             => 'Eigene Benutzerseite',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 360c2be9bc..cf9521ad91 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2259,9 +2259,9 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'importlogpage'                    => 'Import log',
 'importlogpagetext'                => 'Administrative imports of pages with edit history from other wikis.',
 'import-logentry-upload'           => 'imported [[$1]] by file upload',
-'import-logentry-upload-detail'    => '$1 revision(s)',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|revision|revisions}}',
 'import-logentry-interwiki'        => 'transwikied $1',
-'import-logentry-interwiki-detail' => '$1 revision(s) from $2',
+'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revision|revisions}} from $2',
 
 # Keyboard access keys for power users
 'accesskey-pt-userpage'             => '.', # don't translate or duplicate this message to other languages