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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 43b36430f..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;
@@ -16,6 +17,7 @@ use File::Temp;
 use Memoize;
 
 my %translations;
+our %filtered;
 memoize("istranslatable");
 memoize("_istranslation");
 memoize("percenttranslated");
@@ -45,7 +47,7 @@ sub getsetup () { #{{{
 				'name' => 'English'
 			},
 			description => "master language (non-PO files)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_slave_languages => {
@@ -56,7 +58,7 @@ sub getsetup () { #{{{
 				'de' => 'Deutsch'
 			},
 			description => "slave languages (PO files)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_translatable_pages => {
@@ -64,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,
 		},
 } #}}}
@@ -118,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);
 } #}}}
@@ -131,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");
 		}
@@ -151,6 +159,7 @@ sub needsbuild () { #{{{
 	}
 
 	# refresh/create POT and PO files as needed
+	my $updated_po_files=0;
 	foreach my $page (keys %pagesources) {
 		my $pageneedsbuild = grep { $_ eq $pagesources{$page} } @$needsbuild;
 		if (istranslatable($page)) {
@@ -165,10 +174,34 @@ sub needsbuild () { #{{{
 					push @pofiles, $pofile;
 				}
 			}
-			refreshpofiles($file, @pofiles) if (@pofiles);
+			if (@pofiles) {
+				refreshpofiles($file, @pofiles) ;
+				map { IkiWiki::rcs_add($_); } @pofiles if ($config{rcs});
+				$updated_po_files = 1;
+			}
+		}
+	}
+
+	# check staged changes in and trigger a wiki refresh.
+	if ($updated_po_files) {
+		if ($config{rcs}) {
+			IkiWiki::disable_commit_hook();
+			IkiWiki::rcs_commit_staged(gettext("updated PO files"),
+				"refreshpofiles", "127.0.0.1");
+			IkiWiki::enable_commit_hook();
+			IkiWiki::rcs_update();
+		}
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
+		# refresh module's private variables
+		%filtered=undef;
+		%translations=undef;
+		foreach my $page (keys %pagesources) {
+			istranslation($page);
 		}
 	}
 
+
 	# make existing translations depend on the corresponding master page
 	foreach my $master (keys %translations) {
 		foreach my $slave (values %{$translations{$master}}) {
@@ -224,7 +257,6 @@ sub tweakbestlink ($$) { #{{{
 	return $link;
 } #}}}
 
-our %filtered;
 # We use filter to convert PO to the master page's type,
 # since other plugins should not work on PO files
 sub filter (@) { #{{{
@@ -324,7 +356,7 @@ sub otherlanguages ($) { #{{{
 				url => urlto($translations{$masterpage}{$lang}, $page),
 				code => $lang,
 				language => $config{po_slave_languages}{$lang},
-				percent => percenttranslated($page),
+				percent => percenttranslated($translations{$masterpage}{$lang}),
 			} unless ($lang eq $curlang);
 		}
 	}
@@ -339,8 +371,26 @@ 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)) {
+			foreach my $translation (values %{$translations{$page}}) {
+				add_depends($page, $translation);
+			}
+		}
+		elsif (istranslation($page)) {
+			my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+			add_depends($page, $masterpage);
+			foreach my $translation (values %{$translations{$masterpage}}) {
+				add_depends($page, $translation);
+			}
+		}
 	}
 } # }}}