Index: imagecache_actions.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imagecache/imagecache_actions.inc,v retrieving revision 1.16 diff -u -p -r1.16 imagecache_actions.inc --- imagecache_actions.inc 8 Aug 2008 17:05:12 -0000 1.16 +++ imagecache_actions.inc 30 Sep 2008 21:26:25 -0000 @@ -26,7 +26,7 @@ function imagecache_scale_image(&$image, $data['width'] = $data['width'] ? $data['width'] : 9999999; $data['height'] = $data['height'] ? $data['height'] : 9999999; if (!imageapi_image_scale($image, $data['width'], $data['height'], $data['upscale'])) { - watchdog('imagecache', t('imagecache_scale_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_scale_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true; @@ -47,7 +47,7 @@ function theme_imagecache_scale_and_crop function imagecache_scale_and_crop_image(&$image, $data) { if (!imageapi_image_scale_and_crop($image, $data['width'], $data['height'])) { - watchdog('imagecache', t('imagecache_scale_and_crop failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_scale_and_crop failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true; @@ -105,7 +105,7 @@ function imagecache_deprecated_scale_ima $data['width'] = $data['width'] ? $data['width'] : 9999999; $data['height'] = $data['height'] ? $data['height'] : 9999999; if (!imageapi_image_scale($image, $data['width'], $data['height'])) { - watchdog('imagecache', t('imagecache_deprecated_scale failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_deprecated_scale failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true; @@ -157,7 +157,7 @@ function theme_imagecache_crop($element) function imagecache_crop_image(&$image, $data) { if (!imageapi_image_crop($image, $data['xoffset'], $data['yoffset'], $data['width'], $data['height'])) { - watchdog('imagecache', t('imagecache_crop failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_crop failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true; @@ -178,7 +178,7 @@ function theme_imagecache_desaturate($el function imagecache_desaturate_image(&$image, $data = array()) { if (!imageapi_image_desaturate($image)) { - watchdog('imagecache', t('imagecache_desaturate failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_desaturate failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true; @@ -212,9 +212,9 @@ function imagecache_rotate_form($data) { } function theme_imagecache_rotate($element) { - $output = t('degrees: ') . $element['#value']['degrees'] .', '; - $output .= t('randomize: ') . (($element['#value']['random']) ? t('Yes') : t('No')) .', '; - $output .= t('background: ') . $element['#value']['bgcolor']; + $output = t('degrees:') .' '. $element['#value']['degrees'] .', '; + $output .= t('randomize:') .' '. (($element['#value']['random']) ? t('Yes') : t('No')) .', '; + $output .= t('background:') .' '. $element['#value']['bgcolor']; return $output; } @@ -233,7 +233,7 @@ function imagecache_rotate_image(&$image } if (!imageapi_image_rotate($image, $data['degrees'], $data['bgcolor'])) { - watchdog('imagecache', t('imagecache_rotate_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_rotate_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true; @@ -274,10 +274,10 @@ function imagecache_sharpen_form($data) } function theme_imagecache_sharpen($element) { - $output = t('radius: ') . $element['#value']['radius'] .', '; - $output .= t('sigma: ') . $element['#value']['sigma'] .', '; - $output .= t('amount: ') . $element['#value']['amount'] .', '; - $output .= t('threshold: ') . $element['#value']['threshold'] ; + $output = t('radius:') .' '. $element['#value']['radius'] .', '; + $output .= t('sigma:') .' '. $element['#value']['sigma'] .', '; + $output .= t('amount:') .' '. $element['#value']['amount'] .', '; + $output .= t('threshold:') .' '. $element['#value']['threshold'] ; return $output; } @@ -289,7 +289,7 @@ function imagecache_sharpen_image(&$imag $data['threshold'] = $data['threshold'] ? $data['threshold'] : "0.05"; if (!imageapi_image_sharpen($image, $data['radius'], $data['sigma'], $data['amount'], $data['threshold'])) { - watchdog('imagecache', t('imagecache_sharpen_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR); + watchdog('imagecache', 'imagecache_sharpen_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true)), WATCHDOG_ERROR); return false; } return true;