(bug 17184) Duplicate "z" accesskey in MonoBook

Also (necessarily) changed accesskey-p-logo and tooltip-p-logo so that
they actually work -- previously they were just silently ignored in
favor of duplicating {accesskey,tooltip}-n-mainpage.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 81a1eef..6279fc8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -103,6 +103,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Parser tests no longer fail when $wgExternalLinkTarget is set in LocalSettings
 * (bug 15391) catch DBQueryErrors on external storage insertion. This avoids error 
   messages on save were the edit in fact is saved.
+* (bug 17184) Remove duplicate "z" accesskey in MonoBook
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e4102a4..491c28a 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2878,8 +2878,8 @@ A temporary folder is missing.',
 'accesskey-search'                  => 'f', # do not translate or duplicate this message to other languages
 'accesskey-search-go'               => '', # do not translate or duplicate this message to other languages
 'accesskey-search-fulltext'         => '', # do not translate or duplicate this message to other languages
-'accesskey-p-logo'                  => '', # do not translate or duplicate this message to other languages
-'accesskey-n-mainpage'              => 'z', # do not translate or duplicate this message to other languages
+'accesskey-p-logo'                  => 'z', # do not translate or duplicate this message to other languages
+'accesskey-n-mainpage'              => '', # do not translate or duplicate this message to other languages
 'accesskey-n-portal'                => '', # do not translate or duplicate this message to other languages
 'accesskey-n-currentevents'         => '', # do not translate or duplicate this message to other languages
 'accesskey-n-recentchanges'         => 'r', # do not translate or duplicate this message to other languages
@@ -2941,7 +2941,7 @@ You can view its source.',
 'tooltip-search'                  => 'Search {{SITENAME}}',
 'tooltip-search-go'               => 'Go to a page with this exact name if exists',
 'tooltip-search-fulltext'         => 'Search the pages for this text',
-'tooltip-p-logo'                  => 'Main Page',
+'tooltip-p-logo'                  => 'Visit the Main Page',
 'tooltip-n-mainpage'              => 'Visit the Main Page',
 'tooltip-n-portal'                => 'About the project, what you can do, where to find things',
 'tooltip-n-currentevents'         => 'Find background information on current events',

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index f891996..710d145 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -178,7 +178,7 @@ class MonoBookTemplate extends QuickTemplate {
        <div class="portlet" id="p-logo">
                <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php
                        ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php
-                       echo $skin->tooltipAndAccesskey('n-mainpage') ?>></a>
+                       echo $skin->tooltipAndAccesskey('p-logo') ?>></a>
        </div>
        <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
 <?php