* (bug 8918) Enable PLURAL option for MediaWiki:showingresults and

  MediaWiki:showingresultsnum
* RELEASE-NOTES forgotten in r20075
* Update URL for CategoryTree

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bfcaf9c..fb7f6e3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -232,7 +232,11 @@ lighter making things easier to read.
   galeries to make transparency visible (just MonoBook for now, will add the
   rest soon).
 * (bug 7782) Standardisation of file info at image description pages.
-* (bug 8799) Use redirect table for Special:BrokenRedirects and Special:DoubleRedirects
+* (bug 8799) Use redirect table for Special:BrokenRedirects and
+  Special:DoubleRedirects
+* (bug 1035) View contributions / recentchanges for an IP range.
+* (bug 8918) Enable PLURAL option for MediaWiki:showingresults and
+  MediaWiki:showingresultsnum
 
 == Languages updated ==
 

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 171a29b..ed47cd0 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -743,7 +743,7 @@ function wfBacktrace() {
  */
 function wfShowingResults( $offset, $limit ) {
        global $wgLang;
-       return wfMsg( 'showingresults', $wgLang->formatNum( $limit ), $wgLang->formatNum( $offset+1 ) );
+       return wfMsgExt( 'showingresults', array( 'parseinline' ), $wgLang->formatNum( $limit ), $wgLang->formatNum( $offset+1 ) );
 }
 
 /**
@@ -751,7 +751,7 @@ function wfShowingResults( $offset, $limit ) {
  */
 function wfShowingResultsNum( $offset, $limit, $num ) {
        global $wgLang;
-       return wfMsg( 'showingresultsnum', $wgLang->formatNum( $limit ), $wgLang->formatNum( $offset+1 ), $wgLang->formatNum( $num ) );
+       return wfMsgExt( 'showingresultsnum', array( 'parseinline' ), $wgLang->formatNum( $limit ), $wgLang->formatNum( $offset+1 ), $wgLang->formatNum( $num ) );
 }
 
 /**

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index feae20b..254f0cb 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -778,8 +778,8 @@ Wenn Sie sich mit dem Thema auskennen, können Sie selbst die Seite „[[$1]]“
 'prevn'                 => 'vorherige $1',
 'nextn'                 => 'nächste $1',
 'viewprevnext'          => 'Zeige ($1) ($2) ($3).',
-'showingresults'        => 'Hier sind <b>$1</b> Ergebnisse, beginnend mit Nummer <b>$2</b>.',
-'showingresultsnum'     => 'Hier sind <b>$3</b> Ergebnisse, beginnend mit Nummer <b>$2</b>.',
+'showingresults'        => "Hier {{PLURAL:$1|ist '''1''' Ergebnis|sind '''$1''' Ergebnisse}}, beginnend mit Nummer '''$2'''.",
+'showingresultsnum'     => "Hier {{PLURAL:$3|ist '''1''' Ergebnis|sind '''$1''' Ergebnisse}}, beginnend mit Nummer '''$2'''.",
 'nonefound'             => '<strong>Hinweis</strong>: Erfolglose Suchanfragen werden häufig dadurch verursacht, dass mehr als ein Suchbegriff angegeben wurde. Nur Seiten die alle Suchbegriffe enthalten werden hier angezeigt. Versuchen Sie in diesem Fall die Anzahl der Suchbegriffe zu verringern.',
 'powersearch'           => 'Suche',
 'powersearchtext'       => 'Suche in Namensräumen:<br />$1<br />$2 Weiterleitungen anzeigen<br />Suche nach: $3 $9',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 59b327a..b402595 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1143,8 +1143,8 @@ and the text of $3 pages.",
 'prevn'                        => "previous $1",
 'nextn'                        => "next $1",
 'viewprevnext' => "View ($1) ($2) ($3).",
-'showingresults' => "Showing below up to <b>$1</b> results starting with #<b>$2</b>.",
-'showingresultsnum' => "Showing below <b>$3</b> results starting with #<b>$2</b>.",
+'showingresults' => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.",
+'showingresultsnum' => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.",
 'nonefound'            => "'''Note''': Unsuccessful searches are
 often caused by searching for common words like \"have\" and \"from\",
 which are not indexed, or by specifying more than one search term (only pages