X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2725887734c318350875501e64561f79b8866dfe..88576fd762962c6f287850c9a4553547e2938974:/IkiWiki/Plugin/img.pm?ds=inline

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 2a6533e39..8888b3a56 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -32,7 +32,8 @@ sub preprocess (@) { #{{{
 	}
 
 	add_depends($params{page}, $image);
-	my $file = bestlink($params{page}, $image) || return "[[img $image not found]]";
+	my $file = bestlink($params{page}, $image)
+		|| return "[[img ".sprintf(gettext("%s not found"), $image)."]]";
 
 	my $dir = IkiWiki::dirname($file);
 	my $base = IkiWiki::basename($file);
@@ -45,41 +46,56 @@ sub preprocess (@) { #{{{
 
 	if ($size ne 'full') {
 		my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
-		return "[[img bad size \"$size\"]]" unless (defined $w && defined $h);
+		return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
+			unless (defined $w && defined $h);
 
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
 		$imglink = "$dir/${w}x${h}-$base";
+				
 		will_render($params{page}, $imglink);
 
 		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
 			$r = $im->Read($outfile);
-			return "[[img failed to read $outfile: $r]]" if $r;
+			return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
 		}
 		else {
 			$r = $im->Read(srcfile($file));
-			return "[[img failed to read $file: $r]]" if $r;
+			return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 
 			$r = $im->Resize(geometry => "${w}x${h}");
-			return "[[img failed to resize: $r]]" if $r;
-
-			my @blob = $im->ImageToBlob();
-			writefile($imglink, $config{destdir}, $blob[0], 1);
+			return "[[img ".sprinftf(gettext("failed to resize: %s"), $r)."]]" if $r;
+
+			# don't actually write file in preview mode
+			if (! $params{preview}) {
+				my @blob = $im->ImageToBlob();
+				writefile($imglink, $config{destdir}, $blob[0], 1);
+			}
+			else {
+				$imglink = $file;
+			}
 		}
 	}
 	else {
 		$r = $im->Read(srcfile($file));
-		return "[[img failed to read $file: $r]]" if $r;
+		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 		$imglink = $file;
 	}
 
 	add_depends($imglink, $params{page});
 
-	return '<a href="'.
-		IkiWiki::abs2rel($file, IkiWiki::dirname($params{destpage})).
-		'"><img src="'.
-		IkiWiki::abs2rel($imglink, IkiWiki::dirname($params{destpage})).
+	my ($fileurl, $imgurl);
+	if (! $params{preview}) {
+		$fileurl=urlto($file, $params{destpage});
+		$imgurl=urlto($imglink, $params{destpage});
+	}
+	else {
+		$fileurl="$config{url}/$file";
+		$imgurl="$config{url}/$imglink";
+	}
+
+	return '<a href="'.$fileurl.'"><img src="'.$imgurl.
 		'" alt="'.$alt.'" width="'.$im->Get("width").
 		'" height="'.$im->Get("height").'" /></a>';
 } #}}}
 
-1;
+1