Merge "Change talkpagelinktext to lowercase"

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 3f761f6..779b8b7 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -192,7 +192,7 @@
        "unprotectthispage": "Change protection of this page",
        "newpage": "New page",
        "talkpage": "Discuss this page",
-       "talkpagelinktext": "Talk",
+       "talkpagelinktext": "talk",
        "specialpage": "Special page",
        "personaltools": "Personal tools",
        "addsection": "+",

diff --git a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php
index 0b87727..552dacb 100644 (file)
--- a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php
+++ b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php
@@ -212,7 +212,7 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase {
                                ),
                                'child' => array(
                                        'tag' => 'a',
-                                       'content' => 'Talk',
+                                       'content' => 'talk',
                                )
                        ),
                        $cacheEntry->usertalklink,