X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/258c49ae55b96bb8dcc779f4c61b5ae6cdd280a5..e163b037bf3c9fa68be0971752e6d6584f8d55fd:/IkiWiki/Plugin/po.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3546bef88..ca59a8c9c 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -13,9 +13,12 @@ use File::Temp;
 
 sub import {
 	hook(type => "getsetup", id => "po", call => \&getsetup);
+	hook(type => "checkconfig", id => "po", call => \&checkconfig);
+	hook(type => "scan", id => "po", call => \&scan);
 	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 => "preprocess", id => "translatable", call => \&preprocess_translatable);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 }
 
@@ -45,6 +48,48 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
+		po_translatable_pages => {
+			type => "pagespec",
+			example => "!*/Discussion",
+			description => "PageSpec controlling which pages are translatable",
+			link => "ikiwiki/PageSpec",
+			safe => 1,
+			rebuild => 1,
+		},
+		po_link_to => {
+			type => "string",
+			example => "current",
+			description => "internal linking behavior (default/current/negotiated)",
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
+sub checkconfig () { #{{{
+	foreach my $field (qw{po_master_language po_slave_languages}) {
+		if (! exists $config{$field} || ! defined $config{$field}) {
+			error(sprintf(gettext("Must specify %s"), $field));
+		}
+	}
+	if (! exists $config{po_link_to} ||
+	    ! defined $config{po_link_to}) {
+	    $config{po_link_to}="default";
+	}
+	if (! exists $config{po_translatable_pages} ||
+	    ! defined $config{po_translatable_pages}) {
+	    $config{po_translatable_pages}="";
+	}
+	if ($config{po_link_to} eq "negotiated" && ! $config{usedirs}) {
+		error(gettext("po_link_to=negotiated requires usedirs to be set"));
+	}
+} #}}}
+
+sub scan (@) { #{{{
+	my %params=@_;
+	my $page=$params{page};
+
+	# FIXME: cache (or memoize) the list of translatable/translation pages,
+	# and/or istranslation/istranslated results
 } #}}}
 
 sub targetpage (@) { #{{{
@@ -52,7 +97,7 @@ sub targetpage (@) { #{{{
         my $page=$params{page};
         my $ext=$params{ext};
 
-	if (IkiWiki::PageSpec::match_istranslation($page, $page)) {
+	if (istranslation($page)) {
 		my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
 		if (! $config{usedirs} || $page eq 'index') {
 			return $masterpage . "." . $lang . "." . $ext;
@@ -61,7 +106,7 @@ sub targetpage (@) { #{{{
 			return $masterpage . "/index." . $lang . "." . $ext;
 		}
 	}
-	else {
+	elsif (istranslatable($page)) {
 		if (! $config{usedirs} || $page eq 'index') {
 			return $page . "." . $config{po_master_language}{code} . "." . $ext;
 		}
@@ -69,6 +114,29 @@ sub targetpage (@) { #{{{
 			return $page . "/index." . $config{po_master_language}{code} . "." . $ext;
 		}
 	}
+	return;
+} #}}}
+
+sub tweakurlpath ($) { #{{{
+	my %params = @_;
+	my $url=$params{url};
+	if ($config{po_link_to} eq "negotiated") {
+		$url =~ s!/index.$config{po_master_language}{code}.$config{htmlext}$!/!;
+	}
+	return $url;
+} #}}}
+
+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;
+	}
+	return $link;
 } #}}}
 
 # We use filter to convert PO to the master page's type,
@@ -80,7 +148,7 @@ sub filter (@) { #{{{
 
 	# decide if this is a PO file that should be converted into a translated document,
 	# and perform various sanity checks
-	if (! IkiWiki::PageSpec::match_istranslation($page, $page)) {
+	if (! istranslation($page)) {
 		return $content;
 	}
 
@@ -108,17 +176,6 @@ sub filter (@) { #{{{
 	return $content;
 } #}}}
 
-sub preprocess_translatable (@) { #{{{
-	my %params = @_;
-	my $match = exists $params{match} ? $params{match} : $params{page};
-
-	$pagestate{$params{page}}{po_translatable}{$match}=1;
-
-	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-	return sprintf(gettext("pages %s set as translatable"), $params{match});
-
-} #}}}
-
 sub htmlize (@) { #{{{
 	my %params=@_;
 	my $page = $params{page};
@@ -130,38 +187,67 @@ sub htmlize (@) { #{{{
 	return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 
-package IkiWiki::PageSpec;
-
-sub match_istranslation ($;@) { #{{{
+sub istranslatable ($) { #{{{
 	my $page=shift;
-	my $wanted=shift;
+	my $file=$pagesources{$page};
 
-	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	if (! defined $file
+	    || (defined pagetype($file) && pagetype($file) eq 'po')
+	    || $file =~ /\.pot$/) {
+		return 0;
+	}
+	return pagespec_match($page, $config{po_translatable_pages});
+} #}}}
+
+sub istranslation ($) { #{{{
+	my $page=shift;
+	my $file=$pagesources{$page};
 	if (! defined $file) {
 		return IkiWiki::FailReason->new("no file specified");
 	}
 
-	if (! IkiWiki::pagetype($page) eq 'po') {
-		return IkiWiki::FailReason->new("is not a PO file");
+	if (! defined $file
+	    || ! defined pagetype($file)
+ 	    || ! pagetype($file) eq 'po'
+	    || $file =~ /\.pot$/) {
+		return 0;
 	}
 
 	my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
 	if (! defined $masterpage || ! defined $lang
-	    || ! (length($masterpage) > 0) || ! (length($lang) > 0)) {
-		return IkiWiki::FailReason->new("is not named like a translation file");
+	    || ! (length($masterpage) > 0) || ! (length($lang) > 0)
+	    || ! defined $pagesources{$masterpage}
+	    || ! defined $config{po_slave_languages}{$lang}) {
+		return 0;
 	}
 
-	if (! defined $IkiWiki::pagesources{$masterpage}) {
-		return IkiWiki::FailReason->new("the master page does not exist");
-	}
+	return istranslatable($masterpage);
+} #}}}
 
-	if (! defined $IkiWiki::config{po_slave_languages}{$lang}) {
-		return IkiWiki::FailReason->new("language $lang is not supported");
-	}
 
-	return IkiWiki::SuccessReason->new("page $page is a translation");
+package IkiWiki::PageSpec;
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub match_istranslation ($;@) { #{{{
+	my $page=shift;
+	if (IkiWiki::Plugins::po::istranslation($page)) {
+		return IkiWiki::SuccessReason->new("is a translation page");
+	}
+	else {
+		return IkiWiki::FailReason->new("is not a translation page");
+	}
+} #}}}
 
+sub match_istranslatable ($;@) { #{{{
+	my $page=shift;
+	if (IkiWiki::Plugins::po::istranslatable($page)) {
+		return IkiWiki::SuccessReason->new("is set as translatable in po_translatable_pages");
+	}
+	else {
+		return IkiWiki::FailReason->new("is not set as translatable in po_translatable_pages");
+	}
 } #}}}
 
 1