X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/575d4021e3a2da519f20d83be4916cb172ec5e2f..258c49ae55b96bb8dcc779f4c61b5ae6cdd280a5:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index dbeb0b481..3546bef88 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);
 }
 
@@ -24,12 +25,23 @@ sub getsetup () { #{{{
 			safe => 0,
 			rebuild => 1, # format plugin
 		},
-		po_supported_languages => {
+		po_master_language => {
 			type => "string",
-			example => { 'fr' => { 'name' => 'Français' },
+			example => {
+				'code' => 'en',
+				'name' => 'English'
+			},
+			description => "master language (non-PO files)",
+			safe => 1,
+			rebuild => 1,
+		},
+		po_slave_languages => {
+			type => "string",
+			example => {'fr' => { 'name' => 'Français' },
 				    'es' => { 'name' => 'Castellano' },
 				    'de' => { 'name' => 'Deutsch' },
 			},
+			description => "slave languages (PO files)",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -40,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 (IkiWiki::PageSpec::match_istranslation($page, $page)) {
+		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;
+		}
 	}
 } #}}}
 
@@ -90,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};
@@ -127,7 +156,7 @@ sub match_istranslation ($;@) { #{{{
 		return IkiWiki::FailReason->new("the master page does not exist");
 	}
 
-	if (! defined $IkiWiki::config{po_supported_languages}{$lang}) {
+	if (! defined $IkiWiki::config{po_slave_languages}{$lang}) {
 		return IkiWiki::FailReason->new("language $lang is not supported");
 	}