Merge "Use local context to get messages"

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index d4533aa..d300541 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -64,6 +64,7 @@ regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Bugzilla reports.
 
 * (bug 34192) Namespace gender aliases for Albanian languages (sq & aln)
+* (bug 35541) Namespace gender aliases for Croatian (hr)
 * Mizo (lus) added
 
 === Other changes in 1.20 ===

diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index 1863a63..61c3c27 100644 (file)
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -52,6 +52,11 @@ $namespaceAliases = array(
        'Razgovor_o_slici' => NS_FILE_TALK,
 );
 
+$namespaceGenderAliases = array(
+       NS_USER => array( 'male' => 'Suradnik', 'female' => 'Suradnica' ),
+       NS_USER_TALK => array( 'male' => 'Razgovor_sa_suradnikom', 'female' => 'Razgovor_sa_suradnicom' ),
+);
+
 $specialPageAliases = array(
        'Activeusers'               => array( 'Aktivni_suradnici' ),
        'Allmessages'               => array( 'Sve_poruke' ),

diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index 295b6d7..20181fd 100644 (file)
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -16,6 +16,8 @@ class MessageTest extends MediaWikiLangTestCase {
                $this->assertInstanceOf( 'Message', wfMessage( 'i-dont-exist-evar' ) );
                $this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->text() );
                $this->assertEquals( '<i-dont-exist-evar>', wfMessage( 'i-dont-exist-evar' )->text() );
+               $this->assertEquals( '<i-dont-exist-evar>', wfMessage( 'i-dont-exist-evar' )->plain() );
+               $this->assertEquals( '&lt;i-dont-exist-evar&gt;', wfMessage( 'i-dont-exist-evar' )->escaped() );
        }
 
        function testInLanguage() {