X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/802be941044a1ba3caa8dc3cea9e8932472c3a02..3e341e64c2bcb0c6ae4deba8b4b27a24e90c9db6:/IkiWiki/Plugin/po.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index cfba83995..643621a91 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -19,6 +19,7 @@ use File::Temp;
 use Memoize;
 
 my %translations;
+my @origneedsbuild;
 our %filtered;
 
 memoize("_istranslation");
@@ -38,6 +39,7 @@ sub import { #{{{
 	hook(type => "filter", id => "po", call => \&filter);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 	hook(type => "pagetemplate", id => "po", call => \&pagetemplate, last => 1);
+	hook(type => "change", id => "po", call => \&change);
 	hook(type => "editcontent", id => "po", call => \&editcontent);
 
 	$origsubs{'bestlink'}=\&IkiWiki::bestlink;
@@ -46,6 +48,8 @@ sub import { #{{{
 	inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
 	$origsubs{'targetpage'}=\&IkiWiki::targetpage;
 	inject(name => "IkiWiki::targetpage", call => \&mytargetpage);
+	$origsubs{'urlto'}=\&IkiWiki::urlto;
+	inject(name => "IkiWiki::urlto", call => \&myurlto);
 } #}}}
 
 sub getsetup () { #{{{
@@ -103,6 +107,9 @@ sub checkconfig () { #{{{
 			error(sprintf(gettext("Must specify %s"), $field));
 		}
 	}
+	if (! (keys %{$config{po_slave_languages}})) {
+		error(gettext("At least one slave language must be defined in po_slave_languages"));
+	}
 	map {
 		islanguagecode($_)
 			or error(sprintf(gettext("%s is not a valid language code"), $_));
@@ -146,6 +153,11 @@ sub pofile ($$) { #{{{
 	return File::Spec->catpath('', $dir, $name . "." . $lang . ".po");
 } #}}}
 
+sub pofiles ($) { #{{{
+	my $masterfile=shift;
+	return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
+} #}}}
+
 sub refreshpot ($) { #{{{
 	my $masterfile=shift;
 
@@ -191,56 +203,12 @@ sub refreshpofiles ($@) { #{{{
 sub needsbuild () { #{{{
 	my $needsbuild=shift;
 
-	# build %translations, using istranslation's side-effect
-	foreach my $page (keys %pagesources) {
-		istranslation($page);
-	}
-
-	# refresh/create POT and PO files as needed
-	my $updated_po_files=0;
-	foreach my $page (keys %pagesources) {
-		if (istranslatable($page)) {
-			my $pageneedsbuild = grep { $_ eq $pagesources{$page} } @$needsbuild;
-			my $updated_pot_file=0;
-			my $file=srcfile($pagesources{$page});
-			if ($pageneedsbuild || ! -e potfile($file)) {
-				refreshpot($file);
-				$updated_pot_file=1;
-			}
-			my @pofiles;
-			foreach my $lang (keys %{$config{po_slave_languages}}) {
-				my $pofile=pofile($file, $lang);
-				my $pofile_rel=pofile($pagesources{$page}, $lang);
-				if ($pageneedsbuild || $updated_pot_file || ! -e $pofile) {
-					push @pofiles, $pofile;
-					push @$needsbuild, $pofile_rel
-					  unless grep { $_ eq $pofile_rel } @$needsbuild;
-				}
-			}
-			if (@pofiles) {
-				refreshpofiles($file, @pofiles);
-				map { IkiWiki::rcs_add($_); } @pofiles if ($config{rcs});
-				$updated_po_files = 1;
-			}
-		}
-	}
+	# backup @needsbuild content so that change() can know whether
+	# a given master page was rendered because its source file was changed
+	@origneedsbuild=(@$needsbuild);
 
-	# check staged changes in
-	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();
-		}
-		# refresh module's private variables
-		undef %filtered;
-		undef %translations;
-		foreach my $page (keys %pagesources) {
-			istranslation($page);
-		}
-	}
+	# build %translations, using istranslation's side-effect
+	map istranslation($_), (keys %pagesources);
 
 	# make existing translations depend on the corresponding master page
 	foreach my $master (keys %translations) {
@@ -295,6 +263,22 @@ sub urlto_with_orig_beautiful_urlpath($$) { #{{{
 	return $res;
 } #}}}
 
+sub myurlto ($$;$) { #{{{
+	my $to=shift;
+	my $from=shift;
+	my $absolute=shift;
+
+	# workaround hard-coded /index.$config{htmlext} in IkiWiki::urlto()
+	if (! length $to
+	    && $config{po_link_to} eq "current"
+	    && istranslation($from)
+	    && istranslatable('index')) {
+		my ($masterpage, $curlang) = ($from =~ /(.*)[.]([a-z]{2})$/);
+		return IkiWiki::beautify_urlpath(IkiWiki::baseurl($from) . "index." . $curlang . ".$config{htmlext}");
+	}
+	return $origsubs{'urlto'}->($to,$from,$absolute);
+} #}}}
+
 sub mybestlink ($$) { #{{{
 	my $page=shift;
 	my $link=shift;
@@ -504,6 +488,54 @@ sub pagetemplate (@) { #{{{
 	}
 } # }}}
 
+sub change(@) { #{{{
+	my @rendered=@_;
+
+	my $updated_po_files=0;
+
+	# Refresh/create POT and PO files as needed.
+	foreach my $page (map pagename($_), @rendered) {
+		next unless istranslatable($page);
+		my $file=srcfile($pagesources{$page});
+		my $updated_pot_file=0;
+		if ((grep { $_ eq $pagesources{$page} } @origneedsbuild)
+		    || ! -e potfile($file)) {
+			refreshpot($file);
+			$updated_pot_file=1;
+		}
+		my @pofiles;
+		foreach my $lang (keys %{$config{po_slave_languages}}) {
+			my $pofile=pofile($file, $lang);
+			if ($updated_pot_file || ! -e $pofile) {
+				push @pofiles, $pofile;
+			}
+		}
+		if (@pofiles) {
+			refreshpofiles($file, @pofiles);
+			map { IkiWiki::rcs_add($_); } @pofiles if ($config{rcs});
+			$updated_po_files=1;
+		}
+	}
+
+	if ($updated_po_files) {
+		# Check staged changes in.
+		if ($config{rcs}) {
+			IkiWiki::disable_commit_hook();
+			IkiWiki::rcs_commit_staged(gettext("updated PO files"),
+				"IkiWiki::Plugin::po::change", "127.0.0.1");
+			IkiWiki::enable_commit_hook();
+			IkiWiki::rcs_update();
+		}
+		# Reinitialize module's private variables.
+		undef %filtered;
+		undef %translations;
+		# Trigger a wiki refresh.
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
+	}
+} #}}}
+
 sub editcontent () { #{{{
 	my %params=@_;
 	# as we're previewing or saving a page, the content may have