X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7b7865150f1670e92d6d81ece36902df7028ec97..8211910566922dc66a09fa73286bb311de456afa:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 9a25ff602..f535ebd39 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -9,6 +9,7 @@ use strict;
 use IkiWiki 2.00;
 use Encode;
 use Locale::Po4a::Chooser;
+use Locale::Po4a::Po;
 use File::Basename;
 use File::Copy;
 use File::Spec;
@@ -46,7 +47,7 @@ sub getsetup () { #{{{
 				'name' => 'English'
 			},
 			description => "master language (non-PO files)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_slave_languages => {
@@ -57,7 +58,7 @@ sub getsetup () { #{{{
 				'de' => 'Deutsch'
 			},
 			description => "slave languages (PO files)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_translatable_pages => {
@@ -65,14 +66,14 @@ sub getsetup () { #{{{
 			example => "!*/Discussion",
 			description => "PageSpec controlling which pages are translatable",
 			link => "ikiwiki/PageSpec",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_link_to => {
 			type => "string",
 			example => "current",
 			description => "internal linking behavior (default/current/negotiated)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 } #}}}
@@ -119,6 +120,12 @@ sub refreshpot ($) { #{{{
 	$doc->{TT}{utf_mode} = 1;
 	$doc->{TT}{file_in_charset} = 'utf-8';
 	$doc->{TT}{file_out_charset} = 'utf-8';
+	# let's cheat a bit to force porefs option to be passed to Locale::Po4a::Po;
+	# this is undocument use of internal Locale::Po4a::TransTractor's data,
+	# compulsory since this module prevents us from using the porefs option.
+	my %po_options = ('porefs' => 'none');
+	$doc->{TT}{po_out}=Locale::Po4a::Po->new(\%po_options);
+	# do the actual work
 	$doc->parse;
 	$doc->writepo($potfile);
 } #}}}
@@ -132,7 +139,7 @@ sub refreshpofiles ($@) { #{{{
 
 	foreach my $pofile (@pofiles) {
 		if (-e $pofile) {
-			my $cmd = "msgmerge -U $pofile $potfile";
+			my $cmd = "msgmerge -U --backup=none $pofile $potfile";
 			system ($cmd) == 0
 				or error("[po/refreshpofiles:$pofile] failed to update");
 		}
@@ -186,16 +193,14 @@ sub needsbuild () { #{{{
 		}
 		IkiWiki::refresh();
 		IkiWiki::saveindex();
+		# refresh module's private variables
 		%filtered=undef;
+		%translations=undef;
+		foreach my $page (keys %pagesources) {
+			istranslation($page);
+		}
 	}
 
-	# refresh %translations, using istranslation's side-effect
-	# (not needed yet, but when newly created POT/PO files are
-	# added to %pagesources and other data structures, we'll need
-	# this)
-	foreach my $page (keys %pagesources) {
-		istranslation($page);
-	}
 
 	# make existing translations depend on the corresponding master page
 	foreach my $master (keys %translations) {
@@ -366,6 +371,12 @@ sub pagetemplate (@) { #{{{
 	if (istranslation($page) && $template->query(name => "percenttranslated")) {
 		$template->param(percenttranslated => percenttranslated($page));
 	}
+	if ($template->query(name => "istranslation")) {
+		$template->param(istranslation => istranslation($page));
+	}
+	if ($template->query(name => "istranslatable")) {
+		$template->param(istranslatable => istranslatable($page));
+	}
 	if ($template->query(name => "otherlanguages")) {
 		$template->param(otherlanguages => [otherlanguages($page)]);
 		if (istranslatable($page)) {