| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -208,7 +208,6 @@ |
| 209 | 209 | # image |
| 210 | 210 | |
| 211 | 211 | # "Download high res version" link below the image |
| 212 | | - $msgbig = wfMsgHtml('show-big-image'); |
| 213 | 212 | $msgsize = wfMsgHtml('file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->img->getSize() ), $mime ); |
| 214 | 213 | # We'll show a thumbnail of this image |
| 215 | 214 | if ( $width > $maxWidth || $height > $maxHeight ) { |
| — | — | @@ -225,7 +224,14 @@ |
| 226 | 225 | # Note that $height <= $maxHeight now, but might not be identical |
| 227 | 226 | # because of rounding. |
| 228 | 227 | } |
| | 228 | + $msgbig = wfMsgHtml('show-big-image'); |
| | 229 | + $msgsmall = wfMsg('show-big-image-thumb', $width, $height ); |
| | 230 | + } else { |
| | 231 | + # Image is small enough to show full size on image page |
| | 232 | + $msgbig = $this->img->getName(); |
| | 233 | + $msgsmall = wfMsg( 'file-nohires' ); |
| 229 | 234 | } |
| | 235 | + |
| 230 | 236 | $params['width'] = $width; |
| 231 | 237 | $thumbnail = $this->img->transform( $params ); |
| 232 | 238 | |
| — | — | @@ -234,7 +240,7 @@ |
| 235 | 241 | $showLink = true; |
| 236 | 242 | } else { |
| 237 | 243 | $anchorclose .= |
| 238 | | - wfMsg('show-big-image-thumb', $width, $height ) . |
| | 244 | + $msgsmall . |
| 239 | 245 | '<br />' . Xml::tags( 'a', $linkAttribs, $msgbig ) . ' ' . $msgsize; |
| 240 | 246 | } |
| 241 | 247 | |
| — | — | @@ -317,13 +323,6 @@ |
| 318 | 324 | // Check for MIME type. Other types may have more information in the future. |
| 319 | 325 | if (substr($mime,0,9) == 'image/svg' ) { |
| 320 | 326 | $infores = wfMsg('file-svg', $width_orig, $height_orig ) . '<br />'; |
| 321 | | - } elseif ( substr($mime,0,5) == 'image' ) { |
| 322 | | - $infores = wfMsg('file-nohires') . '<br />'; |
| 323 | | - $info = wfMsg( |
| 324 | | - 'file-info-size', |
| 325 | | - $width_orig, $height_orig, |
| 326 | | - $sk->formatSize( $this->img->getSize() ), |
| 327 | | - $mime ); |
| 328 | 327 | } |
| 329 | 328 | |
| 330 | 329 | global $wgContLang; |