From d347a1a785021521791d667fb187f4ea4ffeed70 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 7 Sep 2008 01:10:35 +0000 Subject: [PATCH] Some form consistency tweaks --- includes/ProtectionForm.php | 6 +++--- languages/messages/MessagesEn.php | 6 ++++-- maintenance/language/messages.inc | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php index 569b9334d7..d05042bfed 100644 --- 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 f24fded51d..12b99c6c9e 100644 --- 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 8da58a443d..e7c734a832 100644 --- 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', -- 2.20.1