* (bug 22925) "sp-contributions-blocked-notice-anon" message now displayed when viewi...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 65f3cab..1898b05 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -39,6 +39,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   'unblockself' permission (which they have by default)
 * (bug 18499) Added "enhanced" URL parameter to switch between old and enhanced
   changes list
+* (bug 22925) "sp-contributions-blocked-notice-anon" message now displayed when
+  viewing contributions of a blocked IP address
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 47005fc..fd5afd5 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -235,7 +235,9 @@ class SpecialContributions extends SpecialPage {
                                                'lim' => 1,
                                                'showIfEmpty' => false,
                                                'msgKey' => array(
-                                                       'sp-contributions-blocked-notice',
+                                                       $userObj->isAnon() ?
+                                                               'sp-contributions-blocked-notice-anon' :
+                                                               'sp-contributions-blocked-notice',
                                                        $nt->getText() # Support GENDER in 'sp-contributions-blocked-notice'
                                                ),
                                                'offset' => '' # don't use $wgRequest parameter offset

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e6cf35b..04de449 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2844,22 +2844,24 @@ $1',
 'month'               => 'From month (and earlier):',
 'year'                => 'From year (and earlier):',
 
-'sp-contributions-newbies'        => 'Show contributions of new accounts only',
-'sp-contributions-newbies-sub'    => 'For new accounts',
-'sp-contributions-newbies-title'  => 'User contributions for new accounts',
-'sp-contributions-blocklog'       => 'block log',
-'sp-contributions-deleted'        => 'deleted user contributions',
-'sp-contributions-logs'           => 'logs',
-'sp-contributions-talk'           => 'talk',
-'sp-contributions-userrights'     => 'user rights management',
-'sp-contributions-blocked-notice' => 'This user is currently blocked.
+'sp-contributions-newbies'             => 'Show contributions of new accounts only',
+'sp-contributions-newbies-sub'         => 'For new accounts',
+'sp-contributions-newbies-title'       => 'User contributions for new accounts',
+'sp-contributions-blocklog'            => 'block log',
+'sp-contributions-deleted'             => 'deleted user contributions',
+'sp-contributions-logs'                => 'logs',
+'sp-contributions-talk'                => 'talk',
+'sp-contributions-userrights'          => 'user rights management',
+'sp-contributions-blocked-notice'      => 'This user is currently blocked.
 The latest block log entry is provided below for reference:',
-'sp-contributions-search'         => 'Search for contributions',
-'sp-contributions-username'       => 'IP address or username:',
-'sp-contributions-submit'         => 'Search',
-'sp-contributions-explain'        => '', # only translate this message to other languages if you have to change it
-'sp-contributions-footer'         => '-', # do not translate or duplicate this message to other languages
-'sp-contributions-footer-anon'    => '-', # do not translate or duplicate this message to other languages
+'sp-contributions-blocked-notice-anon' => 'This IP address is currently blocked.
+The latest block log entry is provided below for reference:',
+'sp-contributions-search'              => 'Search for contributions',
+'sp-contributions-username'            => 'IP address or username:',
+'sp-contributions-submit'              => 'Search',
+'sp-contributions-explain'             => '', # only translate this message to other languages if you have to change it
+'sp-contributions-footer'              => '-', # do not translate or duplicate this message to other languages
+'sp-contributions-footer-anon'         => '-', # do not translate or duplicate this message to other languages
 
 # What links here
 'whatlinkshere'            => 'What links here',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index ae48d14..a99bd42 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1890,6 +1890,7 @@ $wgMessageStructure = array(
                'sp-contributions-talk',
                'sp-contributions-userrights',
                'sp-contributions-blocked-notice',
+               'sp-contributions-blocked-notice-anon',
                'sp-contributions-search',
                'sp-contributions-username',
                'sp-contributions-submit',