From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Fri, 24 Jul 2009 08:09:17 +0000 (+0000)
Subject: Fix a regression from the preference rewrite: The help messages for maximum values... 
X-Git-Tag: 1.31.0-rc.0~40751
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=18b5fb369bc2d45371c48505dbc722c6b0587389;p=lhc%2Fweb%2Fwiklou.git

Fix a regression from the preference rewrite: The help messages for maximum values were lost.
Tweak 'en' messages: Remove () for consistency with other help messages
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 80e4ebd4bd..e81ed5b658 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -688,7 +688,7 @@ class Preferences {
 	}
 
 	static function rcPreferences( $user, &$defaultPreferences ) {
-		global $wgRCMaxAge, $wgUseRCPatrol;
+		global $wgRCMaxAge, $wgUseRCPatrol, $wgLang;
 		## RecentChanges #####################################
 		$defaultPreferences['rcdays'] =
 				array(
@@ -697,6 +697,7 @@ class Preferences {
 					'section' => 'rc/display',
 					'min' => 1,
 					'max' => ceil( $wgRCMaxAge / ( 3600*24 ) ),
+					'help' => wfMsgExt( 'recentchangesdays-max', array( 'parsemag' ), $wgLang->formatNum( ceil( $wgRCMaxAge / ( 3600*24 ) ) ) ),
 				);
 		$defaultPreferences['rclimit'] =
 				array(
@@ -754,6 +755,7 @@ class Preferences {
 					'min' => 0,
 					'max' => 7,
 					'section' => 'watchlist/display',
+					'help' => wfMsgHtml( 'prefs-watchlist-days-max' ),
 					'label-message' => 'prefs-watchlist-days',
 				);
 		$defaultPreferences['wllimit'] =
@@ -762,7 +764,8 @@ class Preferences {
 					'min' => 0,
 					'max' => 1000,
 					'label-message' => 'prefs-watchlist-edits',
-					'section' => 'watchlist/display'
+					'help' => wfMsgHtml( 'prefs-watchlist-edits-max' ),
+					'section' => 'watchlist/display',
 				);
 		$defaultPreferences['extendwatchlist'] =
 				array(
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7b6821ab4e..8c411299d7 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1697,9 +1697,9 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'prefs-rc'                      => 'Recent changes',
 'prefs-watchlist'               => 'Watchlist',
 'prefs-watchlist-days'          => 'Days to show in watchlist:',
-'prefs-watchlist-days-max'      => '(maximum 7 days)',
+'prefs-watchlist-days-max'      => 'Maximum 7 days',
 'prefs-watchlist-edits'         => 'Maximum number of changes to show in expanded watchlist:',
-'prefs-watchlist-edits-max'     => '(maximum number: 1000)',
+'prefs-watchlist-edits-max'     => 'Maximum number: 1000',
 'prefs-watchlist-token'         => 'Watchlist token',
 'prefs-misc'                    => 'Misc',
 'prefs-resetpass'               => 'Change password',
@@ -1718,7 +1718,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'contextchars'                  => 'Context per line:',
 'stub-threshold'                => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):',
 'recentchangesdays'             => 'Days to show in recent changes:',
-'recentchangesdays-max'         => '(maximum $1 {{PLURAL:$1|day|days}})',
+'recentchangesdays-max'         => 'Maximum $1 {{PLURAL:$1|day|days}}',
 'recentchangescount'            => 'Number of edits to show by default:',
 'prefs-help-recentchangescount' => 'This includes recent changes, page histories, and logs.',
 'prefs-help-watchlist-token'    => "Filling in this field with a secret key will generate an RSS feed for your watchlist.