From 6d79fb4d30721d377d853b588476578442f38f2e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sat, 10 May 2008 09:16:58 +0000 Subject: [PATCH] * Some message tweaks --- includes/media/Generic.php | 8 ++++++-- languages/messages/MessagesEn.php | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/includes/media/Generic.php b/includes/media/Generic.php index 8c3ed06f0f..1328df9438 100644 --- a/includes/media/Generic.php +++ b/includes/media/Generic.php @@ -416,10 +416,14 @@ abstract class ImageHandler extends MediaHandler { function getDimensionsString( $file ) { global $wgLang; $pages = $file->pageCount(); + $width = $wgLang->formatNum( $file->getWidth() ); + $height = $wgLang->formatNum( $file->getHeight() ); + $pagesFmt = $wgLang->formatNum( $pages ) + if ( $pages > 1 ) { - return wfMsg( 'widthheightpage', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ), $wgLang->formatNum( $pages ) ); + return wfMsgExt( 'widthheightpage', 'parsemag', $width, $height, $pagesFmt ); } else { - return wfMsg( 'widthheight', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ) ); + return wfMsg( 'widthheight', $width, $height ); } } } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9d27d57a4a..acca2e24d9 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1476,7 +1476,7 @@ please see math/README to configure.', 'right-autoconfirmed' => 'Edit semi-protected pages', 'right-bot' => 'Be treated as an automated process', 'right-nominornewtalk' => 'Not have minor edits to discussion pages trigger the new messages prompt', -'right-apihighlimits' => 'Use API high limits', +'right-apihighlimits' => 'Use higher limits in API queries', 'right-delete' => 'Delete pages', 'right-bigdelete' => 'Delete pages with large histories', 'right-deleterevision' => 'Delete and undelete specific revisions of pages', @@ -1714,7 +1714,7 @@ A click on a column header changes the sorting.', 'redirectstofile' => 'The following files redirect to this file:', 'sharedupload' => 'This file is a shared upload and may be used by other projects.', 'shareduploadwiki' => 'Please see the $1 for further information.', -'shareduploadwiki-desc' => 'The description on its $1 there is shown below.', +'shareduploadwiki-desc' => 'The description on its $1 on the shared repository is shown below.', 'shareduploadwiki-linktext' => 'file description page', 'shareddescriptionfollows' => '-', # do not translate or duplicate this message to other languages 'shareduploadduplicate' => 'This file is a duplicate of $1 from shared repository.', @@ -2713,7 +2713,7 @@ $1', 'imagemaxsize' => 'Limit images on file description pages to:', 'thumbsize' => 'Thumbnail size:', 'widthheight' => '$1×$2', # only translate this message to other languages if you have to change it -'widthheightpage' => '$1×$2, $3 pages', +'widthheightpage' => '$1×$2, $3 {{PLURAL:$3|page|pages}}', 'file-info' => '(file size: $1, MIME type: $2)', 'file-info-size' => '($1 × $2 pixel, file size: $3, MIME type: $4)', 'file-nohires' => 'No higher resolution available.', -- 2.20.1