From 8c65834425f58c18499fcd5b985c3a97027405d4 Mon Sep 17 00:00:00 2001 From: Liangent Date: Tue, 29 May 2012 14:59:30 +0800 Subject: [PATCH] Add new message 'brackets' and use it to kill some hardcoded []s. Change-Id: Idae8d9201d1c291316ab520d204ae8c5cde2d890 --- includes/ChangesList.php | 6 ++++-- includes/Linker.php | 6 +++--- languages/messages/MessagesEn.php | 1 + maintenance/language/messageTypes.inc | 1 + maintenance/language/messages.inc | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/includes/ChangesList.php b/includes/ChangesList.php index c6572b1ae7..d280c9a759 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -874,8 +874,10 @@ class EnhancedChangesList extends ChangesList { array_push( $users, $text ); } - $users = ' [' . - implode( $this->message['semicolon-separator'], $users ) . ']'; + $users = ' ' + . $this->getContext()->msg( 'brackets' )->rawParams( + implode( $this->message['semicolon-separator'], $users ) + )->plain() . ''; $tl = ''; $r .= "$tl"; diff --git a/includes/Linker.php b/includes/Linker.php index 8e02fd9b6b..722df3ae1d 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1641,9 +1641,9 @@ class Linker { * @return string */ public static function generateRollback( $rev ) { - return '[' - . self::buildRollbackLink( $rev ) - . ']'; + return '' + . wfMessage( 'brackets' )->rawParams( self::buildRollbackLink( $rev ) )->plain() + . ''; } /** diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9ac58ae98d..dcddc109d2 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -4426,6 +4426,7 @@ Please confirm that you really want to recreate this page.", 'ellipsis' => '...', # only translate this message to other languages if you have to change it 'percent' => '$1%', # only translate this message to other languages if you have to change it 'parentheses' => '($1)', # only translate this message to other languages if you have to change it +'brackets' => '[$1]', # only translate this message to other languages if you have to change it # Multipage image navigation 'imgmultipageprev' => '← previous page', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 42354eae65..3a9b18ed90 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -452,6 +452,7 @@ $wgOptionalMessages = array( 'ellipsis', 'percent', 'parentheses', + 'brackets', 'autocomment-prefix', 'listgrouprights-right-display', 'listgrouprights-right-revoked', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index f2823a06ee..8b6618d8a2 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -3321,6 +3321,7 @@ $wgMessageStructure = array( 'ellipsis', 'percent', 'parentheses', + 'brackets', ), 'imgmulti' => array( 'imgmultipageprev', -- 2.20.1