Combining new 'diff-multi-rev' and 'diff-multi-revs' to one message with plural.

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 8f093ba..412e8c0 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -450,11 +450,7 @@ CONTROL;
                if ( !$n )
                        return '';
 
-               if ( $n == 1 )
-                       $msg = wfMsg( 'diff-multi-rev' );
-               else
-                       $msg = wfMsg( 'diff-multi-revs', $n );
-
+               $msg = wfMsgExt( 'diff-multi-revs', array( 'parseinline' ), $n );
                return wfMsgExt( 'diff-multi', array('parseinline'), $msg );
        }
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 5f146f9..b97858e 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1092,8 +1092,7 @@ is placed by the site operators.",
 'compareselectedversions' => 'Compare selected versions',
 'editundo'     => 'undo',
 'diff-multi'   => "($1 not shown.)",
-'diff-multi-rev' => "One intermediate revision",
-'diff-multi-revs' => "$1 intermediate revisions",
+'diff-multi-revs' => "{{plural:$1|One intermediate revision|$1 intermediate revisions}}",
 
 # Search results
 #

diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index d575d11..8f0f014 100644 (file)
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -607,8 +607,7 @@ Syynä tähän on luultavasti jatkuva häiriköinti yhteiskäyttökoneelta.',
 'selectolderversionfordiff' => 'Valitse vanhempi versio vertailuun',
 'compareselectedversions'   => 'Vertaile valittuja versioita',
 'diff-multi'           => "(Versioiden välissä $1.)",
-'diff-multi-rev'       => "yksi muu muokkaus",
-'diff-multi-revs'      => "$1 muuta muokkausta",
+'diff-multi-revs'      => "{{plural:$1|yksi muu muokkaus|$1 muuta muokkausta}}",
 
 # Search results
 #