r45156 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45155‎ | r45156 | r45157 >
Date:11:06, 29 December 2008
Author:purodha
Status:deferred (Comments)
Tags:
Comment:
fix error remaining after r45122.
Modified paths:
  • /trunk/extensions/SmoothGallery/SmoothGallery.i18n.php (modified) (history)
  • /trunk/extensions/SmoothGallery/SmoothGalleryClass.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SmoothGallery/SmoothGalleryClass.php
@@ -29,12 +29,12 @@
3030 $error = wfMsg( "smoothgallery-error" );
3131
3232 if ( isset( $galleryArray["missing_images"] ) && isset( $galleryArray["invalid_images"] ) ) {
33 - $error .= wfMsg( "smoothgallery-no-images", implode( ", " , $galleryArray["missing_images"] , count($galleryArray["missing_images"]) ) );
 33+ $error .= wfMsg( "smoothgallery-no-images", implode( ", " , $galleryArray["missing_images"] , count($galleryArray["missing_images"]) , count($galleryArray["missing_images"]) + count($galleryArray["invalid_images"]) ) );
3434 $error .= wfMsg( "smoothgallery-invalid-images", implode( ", " , $galleryArray["invalid_images"] , count($galleryArray["invalid_images"]) ) );
3535 } else if ( isset( $galleryArray["invalid_images"] ) ) {
3636 $error .= wfMsg( "smoothgallery-invalid-images", implode( ", " , $galleryArray["invalid_images"] , count($galleryArray["invalid_images"]) ) );
3737 } else if ( isset( $galleryArray["missing_images"] ) ) {
38 - $error .= wfMsg( "smoothgallery-no-images", implode( ", " , $galleryArray["missing_images"] , count($galleryArray["missing_images"]) ) );
 38+ $error .= wfMsg( "smoothgallery-no-images", implode( ", " , $galleryArray["missing_images"] , count($galleryArray["missing_images"]) , count($galleryArray["missing_images"]) ) );
3939 } else {
4040 $error .= wfMsg( "smoothgallery-not-found" );
4141 }
Index: trunk/extensions/SmoothGallery/SmoothGallery.i18n.php
@@ -20,8 +20,8 @@
2121 'smoothgallery-not-found' => 'No images were added into the gallery.
2222 Please add at least one image.',
2323 'smoothgallery-no-images' => 'No images were found in this gallery.
24 -Make sure {{PLURAL:$2|the image|all images}} requested exist.
25 -The following images were not found: $1',
 24+Make sure {{PLURAL:$3|the image|all images}} requested exist.
 25+The following {{PLURAL:$2|image|images}} were not found: $1',
2626 'smoothgallery-invalid-images' => 'The following requested {{PLURAL:$2|image was|images were}} of an invalid type: $1',
2727 'smoothgallery-unexpected-error' => 'There was an unexpected error.
2828 Please file a bug report.',

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45122Adding PLURAL to messages: smoothgallery-invalid-images smoothgallery-no-imagespurodha13:17, 28 December 2008

Comments

#Comment by Siebrand (talk | contribs)   00:11, 31 December 2008

This should be using wfMsgExt( msg, array( 'parsemag' ), paras );

If it is HTML output, 'escape' should be added inside the array.

Status & tagging log