Some form consistency tweaks

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 569b933..d05042b 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -240,7 +240,7 @@ class ProtectionForm {
                global $wgUser;
 
                $mProtectexpiry = Xml::label( wfMsg( 'protectexpiry' ), 'mwProtectExpiryList' );
-               $mProtectother = Xml::label( wfMsg( 'protect-otheroption' ), 'expires' );
+               $mProtectother = Xml::label( wfMsg( 'protect-othertime' ), 'expires' );
                $mProtectreasonother = Xml::label( wfMsg( 'protectcomment' ), 'wpProtectReasonList' );
                $mProtectreason = Xml::label( wfMsg( 'protect-otherreason' ), 'mwProtect-reason' );
 
@@ -283,7 +283,7 @@ class ProtectionForm {
                if( !$showProtectOptions )
                        $mProtectother = $mProtectexpiry;
 
-               $expiryFormOptions = Xml::option( wfMsg( 'protect-otheroption' ), 'wpProtectExpiryList' );
+               $expiryFormOptions = Xml::option( wfMsg( 'protect-othertime-op' ), 'wpProtectExpiryList' );
                foreach( explode(',', $scExpiryOptions) as $option ) {
                        if ( strpos($option, ":") === false ) $option = "$option:$option";
                        list($show, $value) = explode(":", $option);
@@ -294,7 +294,7 @@ class ProtectionForm {
                
                $reasonDropDown = Xml::listDropDown( 'wpProtectReasonList',
                        wfMsgForContent( 'protect-dropdown' ),
-                       wfMsgForContent( 'protect-otherreason' ), '', 'mwProtect-reason', 4 );
+                       wfMsgForContent( 'protect-otherreason-op' ), '', 'mwProtect-reason', 4 );
 
                // JavaScript will add another row with a value-chaining checkbox
                $out .= Xml::closeElement( 'tbody' ) .

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f24fded..12b99c6 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2299,8 +2299,10 @@ You can change this page's protection level, but it will not affect the cascadin
 'protect-expiring'            => 'expires $1 (UTC)',
 'protect-cascade'             => 'Protect pages included in this page (cascading protection)',
 'protect-cantedit'            => 'You cannot change the protection levels of this page, because you do not have permission to edit it.',
-'protect-otheroption'         => 'other',
-'protect-otherreason'         => 'other/additional:',
+'protect-othertime'           => 'Other time:',
+'protect-othertime-op'        => 'other time',
+'protect-otherreason'         => 'Other/additional:',
+'protect-otherreason-op'      => 'other/additional',
 'protect-dropdown'            => '*Common protection reasons
 ** Excessive vandalism
 ** Excessive spamming

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 8da58a4..e7c734a 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1525,8 +1525,10 @@ $wgMessageStructure = array(
                'protect-expiring',
                'protect-cascade',
                'protect-cantedit',
-               'protect-otheroption',
+               'protect-othertime',
+               'protect-othertime-op',
                'protect-otherreason',
+               'protect-otherreason-op',
                'protect-dropdown',
                'restriction-type',
                'restriction-level',