X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b90f8397f6f0c9c9e9de85ef04c32dba998c31a6..1975d4d35fa47a9f6846d2b4f9c8d1b6fc04ebbf:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 351b9c155..933f4d26e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -15,6 +15,7 @@ sub import {
 	hook(type => "getsetup", id => "po", call => \&getsetup);
 	hook(type => "targetpage", id => "po", call => \&targetpage);
 	hook(type => "filter", id => "po", call => \&filter);
+	hook(type => "preprocess", id => "translatable", call => \&preprocess_translatable);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 }
 
@@ -51,16 +52,22 @@ sub targetpage (@) { #{{{
         my $page=$params{page};
         my $ext=$params{ext};
 
-	if (! IkiWiki::PageSpec::match_istranslation($page, $page)) {
-		return;
-	}
-
-	my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-	if (! $config{usedirs} || $page eq 'index') {
-		return $masterpage.".".$ext.".".$lang;
+	if (pagespec_match($page,"istranslation()")) {
+		my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+		if (! $config{usedirs} || $page eq 'index') {
+			return $masterpage . "." . $lang . "." . $ext;
+		}
+		else {
+			return $masterpage . "/index." . $lang . "." . $ext;
+		}
 	}
 	else {
-		return $masterpage."/index.".$ext.".".$lang;
+		if (! $config{usedirs} || $page eq 'index') {
+			return $page . "." . $config{po_master_language}{code} . "." . $ext;
+		}
+		else {
+			return $page . "/index." . $config{po_master_language}{code} . "." . $ext;
+		}
 	}
 } #}}}
 
@@ -73,7 +80,7 @@ sub filter (@) { #{{{
 
 	# decide if this is a PO file that should be converted into a translated document,
 	# and perform various sanity checks
-	if (! IkiWiki::PageSpec::match_istranslation($page, $page)) {
+	if (! pagespec_match($page, "istranslation()")) {
 		return $content;
 	}
 
@@ -101,6 +108,17 @@ sub filter (@) { #{{{
 	return $content;
 } #}}}
 
+sub preprocess_translatable (@) { #{{{
+	my %params = @_;
+	my $match = exists $params{match} ? $params{match} : $params{page};
+
+	$pagestate{$params{page}}{po_translatable}{$match}=1;
+
+	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
+	return sprintf(gettext("pages %s set as translatable"), $params{match});
+
+} #}}}
+
 sub htmlize (@) { #{{{
 	my %params=@_;
 	my $page = $params{page};