(bug 6032) Plural support for 'undelete_short' in SkinTemplate.php

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 1f77751..ce24659 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -694,7 +694,7 @@ class SkinTemplate extends Skin {
                                                $undelTitle = Title::makeTitle( NS_SPECIAL, 'Undelete' );
                                                $content_actions['undelete'] = array(
                                                        'class' => false,
-                                                       'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ),
+                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $n ),
                                                        'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
                                                        #'href' => $this->makeSpecialUrl("Undelete/$this->thispage")
                                                );

diff --git a/languages/Messages.php b/languages/Messages.php
index ca4ad7c..d012537 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -184,8 +184,7 @@ parent class in order maintain consistency across languages.
 'editthispage' => 'Edit this page',
 'delete' => 'Delete',
 'deletethispage' => 'Delete this page',
-'undelete_short1' => 'Undelete one edit',
-'undelete_short' => 'Undelete $1 edits',
+'undelete_short'       => 'Undelete {{PLURAL:$1|one edit|$1 edits}}',
 'protect' => 'Protect',
 'protectthispage' => 'Protect this page',
 'unprotect' => 'unprotect',

diff --git a/languages/MessagesDe.php b/languages/MessagesDe.php
index 424f2d4..ade6966 100644 (file)
--- a/languages/MessagesDe.php
+++ b/languages/MessagesDe.php
@@ -145,8 +145,7 @@ $wgAllMessagesDe = array(
 "editthispage" => "Seite bearbeiten",
 "delete" => "löschen",
 "deletethispage" => "Diese Seite löschen",
-'undelete_short'       => '$1 Änderungen wiederherstellen',
-'undelete_short1'      => 'eine Änderung Wiederherstellen',
+'undelete_short'       => '{{PLURAL:$1|eine Änderung|$1 Änderungen}} wiederherstellen',
 "protect" => "schützen",
 "protectthispage" => "Artikel schützen",
 'unprotect'            => 'freigeben',

diff --git a/languages/MessagesHe.php b/languages/MessagesHe.php
index 304cc0c..8e88a64 100644 (file)
--- a/languages/MessagesHe.php
+++ b/languages/MessagesHe.php
@@ -151,8 +151,7 @@ $wgAllMessagesHe = array(
 "editthispage"      => "ערכו דף זה",
 "delete"            => "מחק",
 "deletethispage"    => "מחקו דף זה",
-"undelete_short"    => "שחזר $1 עריכות",
-"undelete_short1"   => "שחזר עריכה אחת",
+"undelete_short"    => "שחזר {{plural:$1|עריכה אחת|$1 עריכות}}",
 "protect"           => "הגן",
 "protectthispage"   => "הגנו על דף זה",
 "unprotect"         => "הסר הגנה",