From e5fe5ab87ab93faf7e33c87b8284de6b83f34803 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Wed, 15 Apr 2009 19:41:00 +0000 Subject: [PATCH] Follow up r49442: Make this new error message and two older error messages localizable. --- includes/media/Bitmap.php | 9 ++++++--- languages/messages/MessagesEn.php | 3 +++ maintenance/language/messages.inc | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index 76cc89133b..7144ebd197 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -181,20 +181,23 @@ class BitmapHandler extends ImageHandler { if( !isset( $typemap[$mimeType] ) ) { $err = 'Image type not supported'; wfDebug( "$err\n" ); - return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err ); + $errMsg = wfMsg ( 'thumbnail_image-type' ); + return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $errMsg ); } list( $loader, $colorStyle, $saveType ) = $typemap[$mimeType]; if( !function_exists( $loader ) ) { $err = "Incomplete GD library configuration: missing function $loader"; wfDebug( "$err\n" ); - return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err ); + $errMsg = wfMsg ( 'thumbnail_gd-library', $loader ); + return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $errMsg ); } if ( !file_exists( $srcPath ) ) { $err = "File seems to be missing: $srcPath"; wfDebug( "$err\n" ); - return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err ); + $errMsg = wfMsg ( 'thumbnail_image-missing', $srcPath ); + return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $errMsg ); } $src_image = call_user_func( $loader, $srcPath ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 8b11d5d55f..b16a100ea8 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2866,6 +2866,9 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] 'djvu_no_xml' => 'Unable to fetch XML for DjVu file', 'thumbnail_invalid_params' => 'Invalid thumbnail parameters', 'thumbnail_dest_directory' => 'Unable to create destination directory', +'thumbnail_image-type' => 'Image type not supported', +'thumbnail_gd-library' => 'Incomplete GD library configuration: missing function $1', +'thumbnail_image-missing' => 'File seems to be missing: $1', # Special:Import 'import' => 'Import pages', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index ac182f0e52..20f4096d1b 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2004,6 +2004,9 @@ $wgMessageStructure = array( 'djvu_no_xml', 'thumbnail_invalid_params', 'thumbnail_dest_directory', + 'thumbnail_image-type', + 'thumbnail_gd-library', + 'thumbnail_image-missing', ), 'import' => array( 'import', -- 2.20.1