X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8daaa11baa70e07f6405ccb4474e97cac9627961..66ea9112019913a6751615f39cc509ea70559c56:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5b78014d1..8a3c81755 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -82,7 +82,7 @@ sub checkconfig () { #{{{
 		eval q{use POSIX};
 		error($@) if $@;
 		$ENV{LANG} = $config{locale}
-			if POSIX::setlocale(&POSIX::LC_TIME, $config{locale});
+			if POSIX::setlocale(&POSIX::LC_ALL, $config{locale});
 	}
 
 	if ($config{w3mmode}) {
@@ -636,18 +636,35 @@ sub saveindex () { #{{{
 	close OUT;
 } #}}}
 
+sub template_file ($) { #{{{
+	my $template=shift;
+
+	foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+		return "$dir/$template" if -e "$dir/$template";
+	}
+	return undef;
+} #}}}
+
 sub template_params (@) { #{{{
-	my $filename=shift;
-	
+	my $filename=template_file(shift);
+
+	if (! defined $filename) {
+		return if wantarray;
+		return "";
+	}
+
 	require HTML::Template;
-	return filter => sub {
+	my @ret=(
+		filter => sub {
 			my $text_ref = shift;
 			$$text_ref=&Encode::decode_utf8($$text_ref);
 		},
-		filename => "$config{templatedir}/$filename",
+		filename => $filename,
 		loop_context_vars => 1,
 		die_on_bad_params => 0,
-		@_;
+		@_
+	);
+	return wantarray ? @ret : {@ret};
 } #}}}
 
 sub template ($;@) { #{{{
@@ -816,13 +833,15 @@ sub file_pruned ($$) { #{{{
 	$file =~ m/$regexp/;
 } #}}}
 
+my $gettext_obj;
 sub gettext { #{{{
 	# Only use gettext in the rare cases it's needed.
-	# This overrides future calls of this function.
 	if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
-		eval q{use Locale::gettext};
-		textdomain('ikiwiki');
-		return Locale::gettext::gettext(shift);
+		if (! $gettext_obj) {
+			eval q{use Locale::gettext ''};
+			$gettext_obj=Locale::gettext->domain('ikiwiki');
+		}
+		return $gettext_obj->get(shift);
 	}
 	else {
 		return shift;