From a9e30b0b6b40f64a1ef62498ede1c0fe1d06b3b2 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Mon, 5 Mar 2007 19:53:41 +0000 Subject: [PATCH] * (bug 7782) fix for .svg --- includes/ImagePage.php | 18 +++++++++--------- languages/messages/MessagesDe.php | 3 ++- languages/messages/MessagesEn.php | 3 ++- maintenance/language/messages.inc | 1 + 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/includes/ImagePage.php b/includes/ImagePage.php index b8403ad39e..3ddf192017 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -311,25 +311,25 @@ class ImagePage extends Article { if ($showLink) { - $filename = wfEscapeWikiText( $this->img->getName() ); // Hacky workaround: for some reason we use the incorrect MIME type // image/svg for SVG. This should be fixed internally, but at least // make the displayed type right. if ($mime == 'image/svg') $mime = 'image/svg+xml'; - // Check for MIME type. Other types may have more information in the future. + + $filename = wfEscapeWikiText( $this->img->getName() ); + $info = wfMsg( 'file-info', $sk->formatSize( $this->img->getSize() ), $mime ); $infores = ''; - if ( substr($mime,0,5) == 'image' ) { - $infores = wfMsg('file-nohires') . '
'; + + // Check for MIME type. Other types may have more information in the future. + if (substr($mime,0,9) == 'image/svg' ) { + $infores = wfMsg('file-svg', $width_orig, $height_orig ) . '
'; + } elseif ( substr($mime,0,5) == 'image' ) { + $infores = wfMsg('file-nohires') . '
'; $info = wfMsg( 'file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->img->getSize() ), $mime ); - } else { - $info = wfMsg( - 'file-info', - $sk->formatSize( $this->img->getSize() ), - $mime ); } global $wgContLang; diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index 4c368ba624..f0ded3b191 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -1864,9 +1864,10 @@ Variants for Chinese language 'imagemaxsize' => 'Maximale Bildgröße auf Bildbeschreibungsseiten:', 'thumbsize' => 'Standardgröße der Vorschaubilder (thumbnails):', 'widthheight' => '$1×$2', -'file-info' => 'Dateigröße: $1, MIME-Typ: $2', +'file-info' => '(Dateigröße: $1, MIME-Typ: $2)', 'file-info-size' => '($1 × $2 Pixel, Dateigröße: $3, MIME-Typ: $4)', 'file-nohires' => 'Keine höhere Auflösung vorhanden.', +'file-svg' => 'Dies ist eine verlustfrei skalierbare Vektorgrafik. Basisgröße: $1 × $2 Pixel.', 'show-big-image' => 'Version in höherer Auflösung', 'show-big-image-thumb' => 'Größe der Voransicht: $1 × $2 Pixel', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 863c808382..fd62c4a328 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2291,9 +2291,10 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]] 'imagemaxsize' => 'Limit images on image description pages to:', 'thumbsize' => 'Thumbnail size:', 'widthheight' => '$1×$2', -'file-info' => 'File size: $1, MIME type: $2', +'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.', +'file-svg' => 'This is a lossless scalable vector graphics. Base size: $1 × $2 pixel.', 'show-big-image' => 'Image in higher resolution', 'show-big-image-thumb' => 'Size of this preview: $1 × $2 pixel', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 9901911b52..c3a2b5b9b0 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1562,6 +1562,7 @@ $wgMessageStructure = array( 'file-info', 'file-info-size', 'file-nohires', + 'file-svg', 'show-big-image', 'show-big-image-thumb', ), -- 2.20.1