Reapply part of r38587:

* 'skinpreview' renamed to 'skin-preview': brackets outside of the hyperlink now. Betawiki has done the rename job for all languages already.

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index c3eea3a..3747785 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -816,7 +816,7 @@ class PreferencesForm {
                #
                $wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
                $mptitle = Title::newMainPage();
-               $previewtext = wfMsg('skinpreview');
+               $previewtext = wfMsg('skin-preview');
                # Only show members of Skin::getSkinNames() rather than
                # $skinNames (skins is all skin names from Language.php)
                $validSkinNames = Skin::getSkinNames();
@@ -835,7 +835,7 @@ class PreferencesForm {
                        $checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
 
                        $mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
-                       $previewlink = "<a target='_blank' href=\"$mplink\">$previewtext</a>";
+                       $previewlink = "(<a target='_blank' href=\"$mplink\">$previewtext</a>)";
                        if( $skinkey == $wgDefaultSkin )
                                $sn .= ' (' . wfMsg( 'default' ) . ')';
                        $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<br />\n" );

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 6428142..b169d9f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -537,8 +537,6 @@ XHTML id names.
 'underline-never'   => 'Never',
 'underline-default' => 'Browser default',
 
-'skinpreview' => '(Preview)',
-
 # Dates
 'sunday'        => 'Sunday',
 'monday'        => 'Monday',
@@ -1403,6 +1401,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'qbsettings-floatingright' => 'Floating right',
 'changepassword'           => 'Change password',
 'skin'                     => 'Skin',
+'skin-preview'             => 'Preview',
 'math'                     => 'Math',
 'dateformat'               => 'Date format',
 'datedefault'              => 'No preference',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 7618d84..b506604 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -58,9 +58,6 @@ $wgMessageStructure = array(
                'underline-never',
                'underline-default',
        ),
-       'skinpreview' => array(
-               'skinpreview',
-       ),
        'dates' => array(
                'sunday',
                'monday',
@@ -752,6 +749,7 @@ $wgMessageStructure = array(
                'qbsettings-floatingright',
                'changepassword',
                'skin',
+               'skinpreview',
                'math',
                'dateformat',
                'datedefault',
@@ -2624,7 +2622,6 @@ XHTML id it should only appear once and include characters that are legal
 XHTML id names.",
        'toggles'             => 'User preference toggles',
        'underline'           => '',
-       'skinpreview'         => '',
        'dates'               => 'Dates',
        'categorypages'       => 'Categories related messages',
        'mainpage'            => '',