From a23d2475aafd0956a30549cbfff25f0c2e7a837e Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Tue, 11 Jan 2011 07:37:42 +0000 Subject: [PATCH] Follow-up r79964: Use the existing message 'parentheses' instead of introducing an identical one. --- includes/ImagePage.php | 2 +- includes/specials/SpecialSearch.php | 2 +- languages/messages/MessagesEn.php | 1 - languages/messages/MessagesQqq.php | 1 - maintenance/language/messages.inc | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 7c127d1bd5..bfae00b826 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -330,7 +330,7 @@ class ImagePage extends Article { $height_orig = $this->displayImg->getHeight( $page ); $height = $height_orig; - $longDesc = wfMsgExt( 'file-info-wrapper', 'parseinline', $this->displayImg->getLongDesc() ); + $longDesc = wfMsgExt( 'parentheses', 'parseinline', $this->displayImg->getLongDesc() ); wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) ); diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 7f5b7f113e..64394b6888 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -594,7 +594,7 @@ class SpecialSearch extends SpecialPage { if( $img ) { $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) ); if( $thumb ) { - $desc = wfMsgExt( 'file-info-wrapper', 'parseinline', $img->getShortDesc() ); + $desc = wfMsgExt( 'parentheses', 'parseinline', $img->getShortDesc() ); wfProfileOut( __METHOD__ ); // Float doesn't seem to interact well with the bullets. // Table messes up vertical alignment of the bullets. diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index dd6f7c142d..a60a26c63b 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3604,7 +3604,6 @@ By executing it, your system may be compromised.", 'widthheightpage' => '$1×$2, $3 {{PLURAL:$3|page|pages}}', 'file-info' => 'file size: $1, MIME type: $2', 'file-info-size' => '$1 × $2 pixels, file size: $3, MIME type: $4', -'file-info-wrapper' => '($1)', 'file-nohires' => 'No higher resolution available.', 'svg-long-desc' => 'SVG file, nominally $1 × $2 pixels, file size: $3', 'show-big-image' => 'Full resolution', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 9dffc46782..a82be331ac 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -3059,7 +3059,6 @@ The message appears after the name of the patroller.', 'widthheightpage' => 'This message is used on image pages in the dimensions column in the file history section for images with more than one page. Parameter $1 is the image width (in pixels), parameter $2 is the image height, and parameter $3 is the number of pages.', 'file-info' => 'File info displayed on file description page.', 'file-info-size' => 'File info displayed on file description page.', -'file-info-wrapper' => 'Surrounds file info descriptions', 'file-nohires' => 'File info displayed on file description page. For example of message in use see [[:File:Mouse10.gif]].', 'svg-long-desc' => 'Displayed under an SVG image at the image description page. Note that argument 3 is a string that includes the file size unit symbol. See for example [[:File:Yes check.svg]].', 'show-big-image' => 'Displayed under an image at the image description page, when it is displayed smaller there than it was uploaded.', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 30a89960f5..e7d891a9d8 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2560,7 +2560,6 @@ $wgMessageStructure = array( 'widthheightpage', 'file-info', 'file-info-size', - 'file-info-wrapper', 'file-nohires', 'svg-long-desc', 'show-big-image', -- 2.20.1