X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1b5f610a974bedd98b4feeaf566f6ad2eeb6acab..bd50ba3e8392db13c584b4166783ee4794b20365:/IkiWiki/Plugin/po.pm?ds=inline

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 62632e1df..b33d4dc1b 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -24,12 +24,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 +51,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;
+		}
 	}
 } #}}}
 
@@ -92,9 +109,13 @@ sub filter (@) { #{{{
 
 sub htmlize (@) { #{{{
 	my %params=@_;
+	my $page = $params{page};
 	my $content = $params{content};
-	# FIXME: run master page's type htmlize hook
-	return $content;
+	my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+	my $masterfile = srcfile($pagesources{$masterpage});
+
+	# force content to be htmlize'd as if it was the same type as the master page
+	return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 
 package IkiWiki::PageSpec;
@@ -123,7 +144,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");
 	}