X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2476447a5b10843670287e0896871f68c3b9d1c6..4c4416f97e555070d4e80f06e5a8c9accb586087:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9f6c3bb1f..8f7d8d20b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
-                 displaytime will_render
+                 displaytime will_render gettext
                  %config %links %renderedfiles %pagesources);
 our $VERSION = 1.01; # plugin interface version
 
@@ -38,7 +38,7 @@ sub defaultconfig () { #{{{
 	wikiname => "wiki",
 	default_pageext => "mdwn",
 	cgi => 0,
-	rcs => 'svn',
+	rcs => '',
 	notify => 0,
 	url => '',
 	cgiurl => '',
@@ -96,7 +96,7 @@ sub checkconfig () { #{{{
 	}
 
 	if ($config{cgi} && ! length $config{url}) {
-		error("Must specify url to wiki with --url when using --cgi\n");
+		error(gettext("Must specify url to wiki with --url when using --cgi"));
 	}
 	
 	$config{wikistatedir}="$config{srcdir}/.ikiwiki"
@@ -129,6 +129,8 @@ sub loadplugins () { #{{{
 sub loadplugin ($) { #{{{
 	my $plugin=shift;
 
+	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
+
 	my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
 	eval qq{use $mod};
 	if ($@) {
@@ -139,7 +141,8 @@ sub loadplugin ($) { #{{{
 sub error ($) { #{{{
 	if ($config{cgi}) {
 		print "Content-type: text/html\n\n";
-		print misctemplate("Error", "<p>Error: @_</p>");
+		print misctemplate(gettext("Error"),
+			"<p>".gettext("Error").": @_</p>");
 	}
 	log_message(error => @_);
 	exit(1);
@@ -316,6 +319,10 @@ sub bestlink ($$) { #{{{
 		}
 	} while $cwd=~s!/?[^/]+$!!;
 
+	if (length $config{userdir} && exists $links{"$config{userdir}/".lc($link)}) {
+		return "$config{userdir}/".lc($link);
+	}
+
 	#print STDERR "warning: page $page, broken link: $link\n";
 	return "";
 } #}}}
@@ -413,6 +420,7 @@ sub htmllink ($$$;$$$) { #{{{
 		$bestlink=htmlpage($bestlink);
 	}
 	if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) {
+		return $linktext unless length $config{cgiurl};
 		return "<span><a href=\"".
 			cgiurl(do => "create", page => lc($link), from => $page).
 			"\">?</a>$linktext</span>"
@@ -509,7 +517,9 @@ sub preprocess ($$$;$) { #{{{
 			if ($preprocessing{$page}++ > 3) {
 				# Avoid loops of preprocessed pages preprocessing
 				# other pages that preprocess them, etc.
-				return "[[$command preprocessing loop detected on $page at depth $preprocessing{$page}]]";
+				return "[[".sprintf(gettext("%s preprocessing loop detected on %s at depth %i"),
+					$command, $page, $preprocessing{$page}).
+				"]]";
 			}
 			my $ret=$hooks{preprocess}{$command}{call}->(
 				@params,
@@ -802,6 +812,19 @@ sub file_pruned ($$) { #{{{
 	$file =~ m/$regexp/;
 } #}}}
 
+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);
+	}
+	else {
+		return shift;
+	}
+} #}}}
+
 sub pagespec_match ($$) { #{{{
 	my $page=shift;
 	my $spec=shift;