Use a new message for protection form expiry options instead of recycling the blockip...

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 8508831..20026ac 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -322,7 +322,7 @@ class ProtectionForm {
                                wfMsgForContent( 'protect-otherreason-op' ), 
                                $this->mReasonSelection,
                                'mwProtect-reason', 4 );
-                       $scExpiryOptions = wfMsgForContent( 'ipboptions' ); // FIXME: use its own message
+                       $scExpiryOptions = wfMsgForContent( 'protect-expiry-options' );
 
                        $showProtectOptions = ($scExpiryOptions !== '-' && !$this->disabled);
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 5a2bbf6..5d53ef3 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2393,6 +2393,7 @@ You can change this page's protection level, but it will not affect the cascadin
 ** Counter-productive edit warring
 ** High traffic page',
 'protect-edit-reasonlist'     => 'Edit protection reasons',
+'protect-expiry-options'      => '1 hour:1 hour,1 day:1 day,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite',
 'restriction-type'            => 'Permission:',
 'restriction-level'           => 'Restriction level:',
 'minimum-size'                => 'Min size',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 279f53f..a1e962a 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1579,6 +1579,7 @@ $wgMessageStructure = array(
                'protect-otherreason-op',
                'protect-dropdown',
                'protect-edit-reasonlist',
+               'protect-expiry-options',
                'restriction-type',
                'restriction-level',
                'minimum-size',