X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/22ddd81dd25e3dd814c38ac20b771eca05029759..8daaa11baa70e07f6405ccb4474e97cac9627961:/IkiWiki/Wrapper.pm?ds=sidebyside

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 4a98af622..beabc5649 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -13,22 +13,22 @@ sub gen_wrapper () { #{{{
 	$config{destdir}=abs_path($config{destdir});
 	my $this=abs_path($0);
 	if (! -x $this) {
-		error("$this doesn't seem to be executable");
+		error(sprintf(gettext("%s doesn't seem to be executable"), $this));
 	}
 
 	if ($config{setup}) {
-		error("cannot create a wrapper that uses a setup file");
+		error(gettext("cannot create a wrapper that uses a setup file"));
 	}
 	my $wrapper=possibly_foolish_untaint($config{wrapper});
 	if (! defined $wrapper || ! length $wrapper) {
-		error("wrapper filename not specified");
+		error(gettext("wrapper filename not specified"));
 	}
 	delete $config{wrapper};
 	
 	my @envsave;
 	push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
 	               CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
-		       HTTP_COOKIE} if $config{cgi};
+		       HTTP_COOKIE REMOTE_USER} if $config{cgi};
 	my $envsave="";
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF"
@@ -59,7 +59,9 @@ EOF
 	$configstring=~s/"/\\"/g;
 	$configstring=~s/\n/\\\n/g;
 	
-	open(OUT, ">$wrapper.c") || error("failed to write $wrapper.c: $!");;
+	#translators: The first parameter is a filename, and the second is
+	#translators: a (probably not translated) error message.
+	open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));;
 	print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
 #define _GNU_SOURCE
@@ -94,14 +96,16 @@ $envsave
 EOF
 	close OUT;
 	if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
-		error("failed to compile $wrapper.c");
+		#translators: The parameter is a C filename.
+		error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
 	}
 	unlink("$wrapper.c");
 	if (defined $config{wrappermode} &&
 	    ! chmod(oct($config{wrappermode}), $wrapper)) {
 		error("chmod $wrapper: $!");
 	}
-	print "successfully generated $wrapper\n";
+	#translators: The parameter is a filename.
+	printf(gettext("successfully generated %s\n"), $wrapper);
 } #}}}
 
 1