* Rename "ipusuccess" to "unblocked", change the format (now wiki text)

* Correct craziness in release notes

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 21295f3..2d30024 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -538,11 +538,12 @@ Some default configuration options have changed:
 * Add translated magic words to Hebrew localization
 * (bug 6396) Change name for Chuvash language
 * Introduce optional (off by default) language selector bar for user login
-  and registration.
-    Customisable via the "loginlanguagelinks" message, the links will preserve
-  "returnto" values. If the user creates an account while using such a link,
-  then the language in use will be saved as their language preference.
+  and registration. Customisable via the "loginlanguagelinks" message, the
+  links will preserve "returnto" values. If the user creates an account while
+  using such a link, then the language in use will be saved as their language
+  preference.
 * Make sure '~~~' '~~~~' '~~~~~' are removed in Nickname preference.
+* Rename "ipusuccess" to "unblocked", change the format (now wiki text)
 
 == Compatibility ==
 

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 8c43aeb..97ace8d 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -18,8 +18,7 @@ function wfSpecialIpblocklist() {
        $ipu = new IPUnblockForm( $ip, $reason );
 
        if ( "success" == $action ) {
-               $msg = wfMsg( "ipusuccess", htmlspecialchars( $ip ) );
-               $ipu->showList( $msg );
+               $ipu->showList( wfMsgWikiHtml( 'unblocked', $ip ) );
        } else if ( "submit" == $action && $wgRequest->wasPosted() &&
                $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
                if ( ! $wgUser->isAllowed('block') ) {

diff --git a/languages/Messages.php b/languages/Messages.php
index daa8e78..afa99a0 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -1283,7 +1283,7 @@ pages that were vandalized).",
 'unblockiptext'        => 'Use the form below to restore write access
 to a previously blocked IP address or username.',
 'ipusubmit'            => 'Unblock this address',
-'ipusuccess'   => "\"[[$1]]\" unblocked",
+'unblocked' => '[[User:$1|$1]] has been unblocked',
 'ipblocklist'  => 'List of blocked IP addresses and usernames',
 'blocklistline'        => "$1, $2 blocked $3 ($4)",
 'infiniteblock' => 'infinite',