X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/886731612504bd4ac70244497b3313a20b7b6049..307d11541a80a4fed897ef51087c35546506aa70:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index aa592989b..9b5652561 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,8 +17,18 @@ use File::Temp;
 use Memoize;
 
 my %translations;
-memoize("istranslatable");
+our %filtered;
+
+## FIXME: makes some test cases cry once every two tries; this may be
+## related to the artificial way the testsuite is run, or not.
+# memoize("istranslatable");
 memoize("_istranslation");
+memoize("percenttranslated");
+
+# backup references to subs that will be overriden
+my %origsubs;
+$origsubs{'bestlink'}=\&IkiWiki::bestlink;
+$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
 
 sub import {
 	hook(type => "getsetup", id => "po", call => \&getsetup);
@@ -25,10 +36,11 @@ sub import {
 	hook(type => "needsbuild", id => "po", call => \&needsbuild);
 	hook(type => "targetpage", id => "po", call => \&targetpage);
 	hook(type => "tweakurlpath", id => "po", call => \&tweakurlpath);
-	hook(type => "tweakbestlink", id => "po", call => \&tweakbestlink);
 	hook(type => "filter", id => "po", call => \&filter);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 	hook(type => "pagetemplate", id => "po", call => \&pagetemplate);
+	inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+	inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
 }
 
 sub getsetup () { #{{{
@@ -44,7 +56,7 @@ sub getsetup () { #{{{
 				'name' => 'English'
 			},
 			description => "master language (non-PO files)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_slave_languages => {
@@ -55,7 +67,7 @@ sub getsetup () { #{{{
 				'de' => 'Deutsch'
 			},
 			description => "slave languages (PO files)",
-			safe => 1,
+			safe => 0,
 			rebuild => 1,
 		},
 		po_translatable_pages => {
@@ -63,14 +75,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,
 		},
 } #}}}
@@ -95,16 +107,34 @@ sub checkconfig () { #{{{
 	push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 } #}}}
 
-sub refreshpot ($) { #{{{
+sub potfile ($) { #{{{
 	my $masterfile=shift;
 	(my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-	my $potfile=File::Spec->catfile($dir, $name . ".pot");
+	return File::Spec->catfile($dir, $name . ".pot");
+} #}}}
+
+sub pofile ($$) { #{{{
+	my $masterfile=shift;
+	my $lang=shift;
+	(my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
+	return File::Spec->catfile($dir, $name . "." . $lang . ".po");
+} #}}}
+
+sub refreshpot ($) { #{{{
+	my $masterfile=shift;
+	my $potfile=potfile($masterfile);
 	my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
 	my $doc=Locale::Po4a::Chooser::new('text',%options);
 	$doc->read($masterfile);
 	$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);
 } #}}}
@@ -113,13 +143,12 @@ sub refreshpofiles ($@) { #{{{
 	my $masterfile=shift;
 	my @pofiles=@_;
 
-	(my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-	my $potfile=File::Spec->catfile($dir, $name . ".pot");
+	my $potfile=potfile($masterfile);
 	error("[po/refreshpofiles] POT file ($potfile) does not exist") unless (-e $potfile);
 
 	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");
 		}
@@ -138,19 +167,50 @@ sub needsbuild () { #{{{
 		istranslation($page);
 	}
 
-	# refresh POT and PO files as needed
-	foreach my $file (@$needsbuild) {
-		my $page=pagename($file);
+	# 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)) {
-			refreshpot(srcfile($file));
+			my $file=srcfile($pagesources{$page});
+			if ($pageneedsbuild || ! -e potfile($file)) {
+				refreshpot($file);
+			}
 			my @pofiles;
-			foreach my $lang (keys %{$translations{$page}}) {
-				push @pofiles, $pagesources{$translations{$page}{$lang}};
+			foreach my $lang (keys %{$config{po_slave_languages}}) {
+				my $pofile=pofile($file, $lang);
+				if ($pageneedsbuild || ! -e $pofile) {
+					push @pofiles, $pofile;
+				}
+			}
+			if (@pofiles) {
+				refreshpofiles($file, @pofiles) ;
+				map { IkiWiki::rcs_add($_); } @pofiles if ($config{rcs});
+				$updated_po_files = 1;
 			}
-			refreshpofiles(srcfile($file), map { srcfile($_) } @pofiles);
 		}
 	}
 
+	# 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}}) {
@@ -184,29 +244,33 @@ sub targetpage (@) { #{{{
 	return;
 } #}}}
 
-sub tweakurlpath ($) { #{{{
-	my %params = @_;
-	my $url=$params{url};
+sub mybeautify_urlpath ($) { #{{{
+	my $url=shift;
+	my $res=$origsubs{'beautify_urlpath'}->($url);
 	if ($config{po_link_to} eq "negotiated") {
-		$url =~ s!/index.$config{po_master_language}{code}.$config{htmlext}$!/!;
+		$res =~ s!/index.$config{po_master_language}{code}.$config{htmlext}$!/!;
 	}
-	return $url;
+	return $res;
 } #}}}
 
-sub tweakbestlink ($$) { #{{{
-	my %params = @_;
-	my $page=$params{page};
-	my $link=$params{link};
-	if ($config{po_link_to} eq "current"
-	    && istranslatable($link)
-	    && istranslation($page)) {
-		my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-		return $link . "." . $curlang;
+sub mybestlink ($$) { #{{{
+	my $page=shift;
+	my $link=shift;
+	my $res=$origsubs{'bestlink'}->($page, $link);
+	if (length $res) {
+		if ($config{po_link_to} eq "current"
+		    && istranslatable($res)
+		    && istranslation($page)) {
+			my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+			return $res . "." . $curlang;
+		}
+		else {
+			return $res;
+		}
 	}
-	return $link;
+	return "";
 } #}}}
 
-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 (@) { #{{{
@@ -237,7 +301,6 @@ sub filter (@) { #{{{
 		'file_in_charset'  => 'utf-8',
 		'file_out_charset' => 'utf-8',
 	) or error("[po/filter:$file]: failed to translate");
-	my ($percent,$hit,$queries) = $doc->stats();
 	my $tmpfh = File::Temp->new(TEMPLATE => "/tmp/ikiwiki-po-filter-out.XXXXXXXXXX");
 	my $tmpout = $tmpfh->filename;
 	$doc->write($tmpout) or error("[po/filter:$file] could not write $tmpout");
@@ -257,16 +320,40 @@ sub htmlize (@) { #{{{
 	return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 
+sub percenttranslated ($) { #{{{
+	my $page=shift;
+	return "N/A" unless (istranslation($page));
+	my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+	my $file=srcfile($pagesources{$page});
+	my $masterfile = srcfile($pagesources{$masterpage});
+	my (@pos,@masters);
+	push @pos,$file;
+	push @masters,$masterfile;
+	my %options = (
+			"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
+			);
+	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	$doc->process(
+		'po_in_name'	=> \@pos,
+		'file_in_name'	=> \@masters,
+		'file_in_charset'  => 'utf-8',
+		'file_out_charset' => 'utf-8',
+	) or error("[po/percenttranslated:$file]: failed to translate");
+	my ($percent,$hit,$queries) = $doc->stats();
+	return $percent;
+} #}}}
+
 sub otherlanguages ($) { #{{{
 	my $page=shift;
 	my @ret;
 	if (istranslatable($page)) {
 		foreach my $lang (sort keys %{$translations{$page}}) {
+			my $translation = $translations{$page}{$lang};
 			push @ret, {
-				url => urlto($translations{$page}{$lang}, $page),
+				url => urlto($translation, $page),
 				code => $lang,
 				language => $config{po_slave_languages}{$lang},
-				master => 0,
+				percent => percenttranslated($translation),
 			};
 		}
 	}
@@ -283,7 +370,7 @@ sub otherlanguages ($) { #{{{
 				url => urlto($translations{$masterpage}{$lang}, $page),
 				code => $lang,
 				language => $config{po_slave_languages}{$lang},
-				master => 0,
+				percent => percenttranslated($translations{$masterpage}{$lang}),
 			} unless ($lang eq $curlang);
 		}
 	}
@@ -295,8 +382,29 @@ sub pagetemplate (@) { #{{{
         my $page=$params{page};
         my $template=$params{template};
 
+	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);
+			}
+		}
 	}
 } # }}}