X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e..88c6e2891593fd508701d728602515e47284180c:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3503fabc4..02fc4a89e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -10,7 +10,12 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
-use Locale::Po4a::Common qw(nowrapi18n);
+eval q{use Locale::Po4a::Common qw(nowrapi18n !/.*/)};
+if ($@) {
+	print STDERR gettext("warning: Old po4a detected! Recommend upgrade to 0.35.")."\n";
+	eval q{use Locale::Po4a::Common qw(!/.*/)};
+	die $@ if $@;
+}
 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;
@@ -32,7 +37,7 @@ sub import {
 	hook(type => "getsetup", id => "po", call => \&getsetup);
 	hook(type => "checkconfig", id => "po", call => \&checkconfig);
 	hook(type => "needsbuild", id => "po", call => \&needsbuild);
-	hook(type => "scan", id => "po", call => \&scan, last =>1);
+	hook(type => "scan", id => "po", call => \&scan, last => 1);
 	hook(type => "filter", id => "po", call => \&filter);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 	hook(type => "pagetemplate", id => "po", call => \&pagetemplate, last => 1);
@@ -56,6 +61,8 @@ sub import {
 	inject(name => "IkiWiki::urlto", call => \&myurlto);
 	$origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
 	inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
+	$origsubs{'rootpage'}=\&IkiWiki::rootpage;
+	inject(name => "IkiWiki::rootpage", call => \&myrootpage);
 }
 
 
@@ -94,7 +101,7 @@ sub getsetup () {
 			type => "string",
 			example => {
 				'fr' => 'Français',
-				'es' => 'Castellano',
+				'es' => 'Español',
 				'de' => 'Deutsch'
 			},
 			description => "slave languages (PO files)",
@@ -103,7 +110,7 @@ sub getsetup () {
 		},
 		po_translatable_pages => {
 			type => "pagespec",
-			example => "!*/Discussion",
+			example => "* and !*/Discussion",
 			description => "PageSpec controlling which pages are translatable",
 			link => "ikiwiki/PageSpec",
 			safe => 1,
@@ -119,20 +126,18 @@ sub getsetup () {
 }
 
 sub checkconfig () {
-	foreach my $field (qw{po_master_language po_slave_languages}) {
+	foreach my $field (qw{po_master_language}) {
 		if (! exists $config{$field} || ! defined $config{$field}) {
 			error(sprintf(gettext("Must specify %s when using the %s plugin"),
 				      $field, 'po'));
 		}
 	}
-	if (! (keys %{$config{po_slave_languages}})) {
-		error(gettext("At least one slave language must be defined ".
-			      "in po_slave_languages when using the po plugin"));
-	}
+
 	map {
 		islanguagecode($_)
 			or error(sprintf(gettext("%s is not a valid language code"), $_));
 	} ($config{po_master_language}{code}, keys %{$config{po_slave_languages}});
+
 	if (! exists $config{po_translatable_pages} ||
 	    ! defined $config{po_translatable_pages}) {
 		$config{po_translatable_pages}="";
@@ -141,9 +146,7 @@ sub checkconfig () {
 	    ! defined $config{po_link_to}) {
 		$config{po_link_to}='default';
 	}
-	elsif (! grep {
-			$config{po_link_to} eq $_
-		} ('default', 'current', 'negotiated')) {
+	elsif ($config{po_link_to} !~ /^(default|current|negotiated)$/) {
 		warn(sprintf(gettext('%s is not a valid value for po_link_to, falling back to po_link_to=default'),
 			     $config{po_link_to}));
 		$config{po_link_to}='default';
@@ -152,7 +155,27 @@ sub checkconfig () {
 		warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default'));
 		$config{po_link_to}='default';
 	}
+
 	push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
+
+	# Translated versions of the underlays are added if available.
+	foreach my $underlay ("basewiki",
+	                      map { m/^\Q$config{underlaydirbase}\E\/*(.*)/ }
+	                          reverse @{$config{underlaydirs}}) {
+		next if $underlay=~/^locale\//;
+
+		# Underlays containing the po files for slave languages.
+		foreach my $ll (keys %{$config{po_slave_languages}}) {
+			add_underlay("po/$ll/$underlay")
+				if -d "$config{underlaydirbase}/po/$ll/$underlay";
+		}
+	
+		if ($config{po_master_language}{code} ne 'en') {
+			# Add underlay containing translated source files
+			# for the master language.
+			add_underlay("locale/$config{po_master_language}{code}/$underlay");
+		}
+	}
 }
 
 sub needsbuild () {
@@ -183,10 +206,7 @@ sub scan (@) {
 	if (istranslation($page)) {
 		foreach my $destpage (@{$links{$page}}) {
 			if (istranslatable($destpage)) {
-				# replace one occurence of $destpage in $links{$page}
-				# (we only want to replace the one that was added by
-				# IkiWiki::Plugin::link::scan, other occurences may be
-				# there for other reasons)
+				# replace the occurence of $destpage in $links{$page}
 				for (my $i=0; $i<@{$links{$page}}; $i++) {
 					if (@{$links{$page}}[$i] eq $destpage) {
 						@{$links{$page}}[$i] = $destpage . '.' . lang($page);
@@ -262,22 +282,19 @@ sub pagetemplate (@) {
 		$template->param(otherlanguages => [otherlanguagesloop($page)]);
 		map add_depends($page, $_), (values %{otherlanguages($page)});
 	}
-	# Rely on IkiWiki::Render's genpage() to decide wether
-	# a discussion link should appear on $page; this is not
-	# totally accurate, though: some broken links may be generated
-	# when cgiurl is disabled.
-	# This compromise avoids some code duplication, and will probably
-	# prevent future breakage when ikiwiki internals change.
-	# Known limitations are preferred to future random bugs.
-	if ($template->param('discussionlink') && istranslation($page)) {
-		$template->param('discussionlink' => htmllink(
-			$page,
-			$destpage,
-			$masterpage . '/' . gettext("Discussion"),
-			noimageinline => 1,
-			forcesubpage => 0,
-			linktext => gettext("Discussion"),
+	if ($config{discussion} && istranslation($page)) {
+		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
+		   (length $config{cgiurl} ||
+		    exists $links{$masterpage."/".lc($config{discussionpage})})) {
+			$template->param('discussionlink' => htmllink(
+				$page,
+				$destpage,
+				$masterpage . '/' . $config{discussionpage},
+				noimageinline => 1,
+				forcesubpage => 0,
+				linktext => $config{discussionpage},
 		));
+		}
 	}
 	# Remove broken parentlink to ./index.html on home page's translations.
 	# It works because this hook has the "last" parameter set, to ensure it
@@ -287,10 +304,13 @@ sub pagetemplate (@) {
 	    && $masterpage eq "index") {
 		$template->param('parentlinks' => []);
 	}
+	if (ishomepage($page) && $template->query(name => "title")) {
+		$template->param(title => $config{wikiname});
+	}
 } # }}}
 
 # Add the renamed page translations to the list of to-be-renamed pages.
-sub renamepages(@) {
+sub renamepages (@) {
 	my %params = @_;
 
 	my %torename = %{$params{torename}};
@@ -326,13 +346,13 @@ sub renamepages(@) {
 	return @ret;
 }
 
-sub mydelete(@) {
+sub mydelete (@) {
 	my @deleted=@_;
 
 	map { deletetranslations($_) } grep istranslatablefile($_), @deleted;
 }
 
-sub change(@) {
+sub change (@) {
 	my @rendered=@_;
 
 	# All meta titles are first extracted at scan time, i.e. before we turn
@@ -340,14 +360,14 @@ sub change(@) {
 	# PO files breaks the meta plugin's parsing enough to save ugly titles
 	# to %pagestate at this time.
 	#
-	# Then, at render time, every page's passes on row through the Great
+	# Then, at render time, every page passes in turn through the Great
 	# Rendering Chain (filter->preprocess->linkify->htmlize), and the meta
 	# plugin's preprocess hook is this time in a position to correctly
 	# extract the titles from slave pages.
 	#
-	# This is, unfortunately, too late: if the page A, linking to the page B,
-	# is rendered before B, it will display the wrongly-extracted meta title
-	# as the link text to B.
+	# This is, unfortunately, too late: if the page A, linking to the page
+	# B, is rendered before B, it will display the wrongly-extracted meta
+	# title as the link text to B.
 	#
 	# On the one hand, such a corner case only happens on rebuild: on
 	# refresh, every rendered page is fixed to contain correct meta titles.
@@ -362,12 +382,11 @@ sub change(@) {
 	    && exists $config{meta_overrides_page_title}
 	    && defined $config{meta_overrides_page_title}
 	    && $config{meta_overrides_page_title}) {
-		debug(sprintf(gettext("re-rendering all pages to fix meta titles")));
+		debug(sprintf(gettext("rebuilding all pages to fix meta titles")));
 		resetalreadyfiltered();
 		require IkiWiki::Render;
 		foreach my $file (@rendered) {
-			debug(sprintf(gettext("rendering %s"), $file));
-			IkiWiki::render($file);
+			IkiWiki::render($file, sprintf(gettext("building %s"), $file));
 		}
 	}
 
@@ -375,24 +394,30 @@ sub change(@) {
 
 	# Refresh/create POT and PO files as needed.
 	foreach my $file (grep {istranslatablefile($_)} @rendered) {
-		my $page=pagename($file);
 		my $masterfile=srcfile($file);
+		my $page=pagename($file);
 		my $updated_pot_file=0;
-		# Only refresh Pot file if it does not exist, or if
-		# $pagesources{$page} was changed: don't if only the HTML was
+
+		# Avoid touching underlay files.
+		next if $masterfile ne "$config{srcdir}/$file";
+
+		# Only refresh POT file if it does not exist, or if
+		# the source was changed: don't if only the HTML was
 		# refreshed, e.g. because of a dependency.
-		if ((grep { $_ eq $pagesources{$page} } @origneedsbuild)
-		    || ! -e potfile($masterfile)) {
+		if ((grep { $_ eq $pagesources{$page} } @origneedsbuild) ||
+		    ! -e potfile($masterfile)) {
 			refreshpot($masterfile);
 			$updated_pot_file=1;
 		}
 		my @pofiles;
-		map {
-			push @pofiles, $_ if ($updated_pot_file || ! -e $_);
-		} (pofiles($masterfile));
+		foreach my $po (pofiles($masterfile)) {
+			next if ! $updated_pot_file && -e $po;
+			next if grep { $po=~/\Q$_\E/ } @{$config{underlaydirs}};
+			push @pofiles, $po;
+		}
 		if (@pofiles) {
 			refreshpofiles($masterfile, @pofiles);
-			map { IkiWiki::rcs_add($_) } @pofiles if $config{rcs};
+			map { s/^\Q$config{srcdir}\E\/*//; IkiWiki::rcs_add($_) } @pofiles if $config{rcs};
 			$updated_po_files=1;
 		}
 	}
@@ -423,8 +448,8 @@ sub canremove (@) {
 	my %params = @_;
 
 	if (istranslation($params{page})) {
-		return gettext("Can not remove a translation. Removing the master page, ".
-			       "though, removes its translations as well.");
+		return gettext("Can not remove a translation. If the master page is removed, ".
+			       "however, its translations will be removed as well.");
 	}
 	return undef;
 }
@@ -443,8 +468,8 @@ sub canrename (@) {
 		# saved early in the renaming process.
 		my $orig_torename = $session->param("po_orig_torename");
 		unless (grep { $_ eq $masterpage } @{$orig_torename}) {
-			return gettext("Can not rename a translation. Renaming the master page, ".
-				       "though, renames its translations as well.");
+			return gettext("Can not rename a translation. If the master page is renamed, ".
+				       "however, its translations will be renamed as well.");
 		}
 	}
 	return undef;
@@ -507,10 +532,23 @@ sub formbuilder (@) {
 	if ($form->field("do") eq "create") {
 	        foreach my $field ($form->field) {
 			next unless "$field" eq "type";
-			if ($field->type eq 'select') {
-				# remove po from the list of types
-				my @types = grep { $_ ne 'po' } $field->options;
-				$field->options(\@types) if @types;
+			next unless $field->type eq 'select';
+			my $orig_value = $field->value;
+			# remove po from the list of types
+			my @types = grep { $_->[0] ne 'po' } $field->options;
+			$field->options(\@types) if @types;
+			# favor the type of linking page's masterpage
+			if ($orig_value eq 'po') {
+				my ($from, $type);
+				if (defined $form->field('from')) {
+					($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
+					$from = masterpage($from);
+				}
+				if (defined $from && exists $pagesources{$from}) {
+					$type=pagetype($pagesources{$from});
+				}
+				$type=$config{default_pageext} unless defined $type;
+				$field->value($type) ;
 			}
 		}
 	}
@@ -525,11 +563,16 @@ sub mybestlink ($$) {
 	my $page=shift;
 	my $link=shift;
 
+	return $origsubs{'bestlink'}->($page, $link)
+		if $config{po_link_to} eq "default";
+
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
+	my @caller = caller(1);
 	if (length $res
-	    && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")
 	    && istranslatable($res)
-	    && istranslation($page)) {
+	    && istranslation($page)
+	    &&  !(exists $caller[3] && defined $caller[3]
+		  && ($caller[3] eq "IkiWiki::PageSpec::match_link"))) {
 		return $res . "." . lang($page);
 	}
 	return $res;
@@ -580,17 +623,21 @@ sub myurlto ($$;$) {
 	# so that one is redirected to the just-edited page rather than to the
 	# negociated translation; to prevent unnecessary fiddling with caller/inject,
 	# we only do so when our beautify_urlpath would actually do what we want to
-	# avoid, i.e. when po_link_to = negotiated
+	# avoid, i.e. when po_link_to = negotiated.
+	# also avoid doing so when run by cgi_goto, so that the links on recentchanges
+	# page actually lead to the exact page they pretend to.
 	if ($config{po_link_to} eq "negotiated") {
 		my @caller = caller(1);
-		my $run_by_editpage = 0;
-		$run_by_editpage = 1 if (exists $caller[3] && defined $caller[3]
-					 && $caller[3] eq "IkiWiki::cgi_editpage");
+		my $use_orig = 0;
+		$use_orig = 1 if (exists $caller[3] && defined $caller[3]
+				 && ($caller[3] eq "IkiWiki::cgi_editpage" ||
+				     $caller[3] eq "IkiWiki::Plugin::goto::cgi_goto")
+				 );
 		inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'})
-			if $run_by_editpage;
+			if $use_orig;
 		my $res = $origsubs{'urlto'}->($to,$from,$absolute);
 		inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath)
-			if $run_by_editpage;
+			if $use_orig;
 		return $res;
 	}
 	else {
@@ -608,6 +655,22 @@ sub mycgiurl (@) {
 	return $origsubs{'cgiurl'}->(%params);
 }
 
+sub myrootpage (@) {
+	my %params=@_;
+
+	my $rootpage;
+	if (exists $params{rootpage}) {
+		$rootpage=$origsubs{'bestlink'}->($params{page}, $params{rootpage});
+		if (!length $rootpage) {
+			$rootpage=$params{rootpage};
+		}
+	}
+	else {
+		$rootpage=masterpage($params{page});
+	}
+	return $rootpage;
+}
+
 # ,----
 # | Blackboxes for private data
 # `----
@@ -660,9 +723,9 @@ sub istranslatablefile ($) {
 	my $file=shift;
 
 	return 0 unless defined $file;
-	return 0 if defined pagetype($file) && pagetype($file) eq 'po';
+	my $type=pagetype($file);
+	return 0 if ! defined $type || $type eq 'po';
 	return 0 if $file =~ /\.pot$/;
-	return 0 unless -e "$config{srcdir}/$file"; # underlay dirs may be read-only
 	return 1 if pagespec_match(pagename($file), $config{po_translatable_pages});
 	return;
 }
@@ -786,9 +849,10 @@ sub refreshpot ($) {
 	$doc->{TT}{file_in_charset} = 'utf-8';
 	$doc->{TT}{file_out_charset} = 'utf-8';
 	$doc->read($masterfile);
-	# 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.
+	# 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.
 	$doc->{TT}{po_out}=Locale::Po4a::Po->new({ 'porefs' => 'none' });
 	$doc->{TT}{po_out}->set_charset('utf-8');
 	# do the actual work
@@ -808,8 +872,23 @@ sub refreshpofiles ($@) {
 
 	foreach my $pofile (@pofiles) {
 		IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
+
+		if (! -e $pofile) {
+			# If the po file exists in an underlay, copy it
+			# from there.
+			my ($pobase)=$pofile=~/^\Q$config{srcdir}\E\/?(.*)$/;
+			foreach my $dir (@{$config{underlaydirs}}) {
+				if (-e "$dir/$pobase") {
+					File::Copy::syscopy("$dir/$pobase",$pofile)
+						or error("po(refreshpofiles) ".
+							 sprintf(gettext("failed to copy underlay PO file to %s"),
+								 $pofile));
+				}
+			}
+		}
+
 		if (-e $pofile) {
-			system("msgmerge", "-U", "--backup=none", $pofile, $potfile) == 0
+			system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
 				or error("po(refreshpofiles) ".
 					 sprintf(gettext("failed to update %s"),
 						 $pofile));
@@ -896,7 +975,7 @@ sub otherlanguagesloop ($) {
 				master => 1,
 			};
 		}
-		else {
+		elsif (istranslation($otherpage)) {
 			push @ret, {
 				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
 				code => $lang,
@@ -906,10 +985,10 @@ sub otherlanguagesloop ($) {
 		}
 	}
 	return sort {
-			return -1 if $a->{code} eq $config{po_master_language}{code};
-			return 1 if $b->{code} eq $config{po_master_language}{code};
-			return $a->{language} cmp $b->{language};
-		} @ret;
+		return -1 if $a->{code} eq $config{po_master_language}{code};
+		return 1 if $b->{code} eq $config{po_master_language}{code};
+		return $a->{language} cmp $b->{language};
+	} @ret;
 }
 
 sub homepageurl (;$) {
@@ -918,6 +997,14 @@ sub homepageurl (;$) {
 	return urlto('', $page);
 }
 
+sub ishomepage ($) {
+	my $page = shift;
+
+	return 1 if $page eq 'index';
+	map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
+	return undef;
+}
+
 sub deletetranslations ($) {
 	my $deletedmasterfile=shift;
 
@@ -1071,8 +1158,8 @@ sub isvalidpo ($) {
 	if ($res) {
 	    return IkiWiki::SuccessReason->new("valid gettext data");
 	}
-	return IkiWiki::FailReason->new("invalid gettext data, go back ".
-					"to previous page to go on with edit");
+	return IkiWiki::FailReason->new(gettext("invalid gettext data, go back ".
+					"to previous page to continue edit"));
 }
 
 # ,----