Use present function for adding accesskey. This way the browser key combination is...

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 4239e1b..6b0eff5 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -337,7 +337,8 @@ class IPBlockForm {
                                <td style='padding-top: 1em'>&#160;</td>
                                <td  class='mw-submit' style='padding-top: 1em'>" .
                                        Xml::submitButton( wfMsg( $alreadyBlocked ? 'ipb-change-block' : 'ipbsubmit' ),
-                                               array( 'name' => 'wpBlock', 'tabindex' => '13', 'accesskey' => 's' ) ) . "
+                                               array( 'name' => 'wpBlock', 'tabindex' => '13' )
+                                                       + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'blockip-block' ) ). "
                                </td>
                        </tr>" .
                        Xml::closeElement( 'table' ) .

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 3559dde..9872b1d 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -33,7 +33,7 @@ class SpecialExport extends SpecialPage {
        public function execute( $par ) {
                global $wgOut, $wgRequest, $wgSitename, $wgExportAllowListContributors;
                global $wgExportAllowHistory, $wgExportMaxHistory, $wgExportMaxLinkDepth;
-               global $wgExportFromNamespaces;
+               global $wgExportFromNamespaces, $wgUser;
 
                $this->setHeaders();
                $this->outputHeader();
@@ -172,7 +172,7 @@ class SpecialExport extends SpecialPage {
                //$form .= Xml::checkLabel( wfMsg( 'export-images' ), 'images', 'wpExportImages', false ) . '<br />';
                $form .= Xml::checkLabel( wfMsg( 'export-download' ), 'wpDownload', 'wpDownload', true ) . '<br />';
 
-               $form .= Xml::submitButton( wfMsg( 'export-submit' ), array( 'accesskey' => 's' ) );
+               $form .= Xml::submitButton( wfMsg( 'export-submit' ), $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'export' ) );
                $form .= Xml::closeElement( 'form' );
                $wgOut->addHTML( $form );
        }

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index d5d80df..d5b25db 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -257,7 +257,7 @@ class SpecialImport extends SpecialPage {
                                        <td>
                                        </td>
                                        <td class='mw-submit'>" .
-                                               Xml::submitButton( wfMsg( 'import-interwiki-submit' ), array( 'accesskey' => 's' ) ) .
+                                               Xml::submitButton( wfMsg( 'import-interwiki-submit' ), $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'import' ) ) .
                                        "</td>
                                </tr>" .
                                Xml::closeElement( 'table' ).

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index bec96ec..052f9a3 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -441,7 +441,8 @@ class UserrightsPage extends SpecialPage {
                                <tr>
                                        <td></td>
                                        <td class='mw-submit'>" .
-                                               Xml::submitButton( wfMsg( 'saveusergroups' ), array( 'name' => 'saveusergroups', 'accesskey' => 's' ) ) .
+                                               Xml::submitButton( wfMsg( 'saveusergroups' ),
+                                                       array( 'name' => 'saveusergroups' ) + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'userrights-set' ) ) .
                                        "</td>
                                </tr>" .
                        Xml::closeElement( 'table' ) . "\n" .

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 236c033..152cd6c 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3335,6 +3335,10 @@ Please try again.',
 'accesskey-upload'                  => 's', # do not translate or duplicate this message to other languages
 'accesskey-preferences-save'        => 's', # do not translate or duplicate this message to other languages
 'accesskey-summary'                 => 'b', # do not translate or duplicate this message to other languages
+'accesskey-userrights-set'          => 's', # do not translate or duplicate this message to other languages
+'accesskey-blockip-block'           => 's', # do not translate or duplicate this message to other languages
+'accesskey-export'                  => 's', # do not translate or duplicate this message to other languages
+'accesskey-import'                  => 's', # do not translate or duplicate this message to other languages
 
 # Tooltip help for the actions
 'tooltip-pt-userpage'             => 'Your user page',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 635b430..cb5c5cc 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -71,6 +71,10 @@ $wgIgnoredMessages = array(
        'accesskey-upload',
        'accesskey-preferences-save',
        'accesskey-summary',
+       'accesskey-userrights-set',
+       'accesskey-blockip-block',
+       'accesskey-export',
+       'accesskey-import',
        'addsection',
        'talkpageheader',
        'anonnotice',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index c5269ef..ff7d75d 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2299,6 +2299,10 @@ $wgMessageStructure = array(
                'accesskey-upload',
                'accesskey-preferences-save',
                'accesskey-summary',
+               'accesskey-userrights-set',
+               'accesskey-blockip-block',
+               'accesskey-export',
+               'accesskey-import',
        ),
        'tooltips' => array(
                'tooltip-pt-userpage',