Merge "Support GENDER in MediaWiki:Blockip and Special:Block"

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 3fa491c..5d4fc07 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -152,6 +152,7 @@ production.
 * A JSONContent and JSONContentHandler were added for extensions to extend.
 
 === Bug fixes in 1.24 ===
+* (bug 50572) MediaWiki:Blockip should support gender
 * (bug 49116) Footer copyright notice is now always displayed in user language
   rather than content language (same as copyright notice for editing interface).
 * (bug 62258) A bug was fixed in File::getUnscaledThumb when a height

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9ed7fed..867d8ec 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1331,6 +1331,7 @@ class SkinTemplate extends Skin {
 
                        if ( $this->getUser()->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
+                                       'text' => $this->msg( 'blockip', $rootUser )->text(),
                                        'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser )
                                );
                        }

diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index 6586a3d..8e52268 100644 (file)
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -1924,7 +1924,7 @@
        "autoblockid": "Autoblok #$1",
        "block": "Zablokovat uživatele",
        "unblock": "Odblokovat uživatele",
-       "blockip": "Zablokovat uživatele",
+       "blockip": "Zablokovat {{GENDER:$1|uživatele|uživatelku}}",
        "blockip-legend": "Zablokovat uživatele",
        "blockiptext": "Tento formulář slouží k zablokování editací z konkrétní IP adresy nebo uživatelského jména.\nToto by mělo být používáno jen v souladu s [[{{MediaWiki:Policy-url}}|pravidly]].\nUdejte přesný důvod níže (například ocitujte, které stránky byly poškozeny).",
        "ipaddressorusername": "IP adresa nebo uživatelské jméno:",
@@ -1953,7 +1953,7 @@
        "ipb-unblock-addr": "Odblokovat {{GENDER:$1|uživatele|uživatelku|uživatele nebo IP adresu}} $1",
        "ipb-unblock": "Odblokovat uživatele nebo IP adresu",
        "ipb-blocklist": "Zobrazit probíhající bloky",
-       "ipb-blocklist-contribs": "Příspěvky uživatele $1",
+       "ipb-blocklist-contribs": "Příspěvky {{GENDER:$1|uživatele|uživatelky}} $1",
        "unblockip": "Odblokovat uživatele",
        "unblockiptext": "Tímto formulářem je možno obnovit právo blokované IP adresy či uživatele opět přispívat do {{grammar:2sg|{{SITENAME}}}}.",
        "ipusubmit": "Odblokovat",

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4352f36..8230d7f 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2046,7 +2046,7 @@
        "block": "Block user",
        "unblock": "Unblock user",
        "unblock-summary": "",
-       "blockip": "Block user",
+       "blockip": "Block {{GENDER:$1|user}}",
        "blockip-legend": "Block user",
        "blockiptext": "Use the form below to block write access from a specific IP address or username.\nThis should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in a specific reason below (for example, citing particular pages that were vandalized).",
        "ipaddressorusername": "IP address or username:",
@@ -2075,7 +2075,7 @@
        "ipb-unblock-addr": "Unblock $1",
        "ipb-unblock": "Unblock a username or IP address",
        "ipb-blocklist": "View existing blocks",
-       "ipb-blocklist-contribs": "Contributions for $1",
+       "ipb-blocklist-contribs": "Contributions for {{GENDER:$1|$1}}",
        "unblockip": "Unblock user",
        "unblockiptext": "Use the form below to restore write access to a previously blocked IP address or username.",
        "ipusubmit": "Remove this block",