X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/bd50ba3e8392db13c584b4166783ee4794b20365..fdc7974b2ac995b4ff12dfa208741189ff4bd274:/IkiWiki/Plugin/po.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index b33d4dc1b..7b9945b0a 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -13,8 +13,11 @@ use File::Temp; sub import { hook(type => "getsetup", id => "po", call => \&getsetup); + hook(type => "checkconfig", id => "po", call => \&checkconfig); hook(type => "targetpage", id => "po", call => \&targetpage); + hook(type => "tweakurlpath", id => "po", call => \&tweakurlpath); hook(type => "filter", id => "po", call => \&filter); + hook(type => "preprocess", id => "translatable", call => \&preprocess_translatable); hook(type => "htmlize", id => "po", call => \&htmlize); } @@ -44,6 +47,28 @@ sub getsetup () { #{{{ 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 ($config{po_link_to} eq "negotiated" && ! $config{usedirs}) { + error(gettext("po_link_to=negotiated requires usedirs to be set")); + } } #}}} sub targetpage (@) { #{{{ @@ -51,7 +76,7 @@ sub targetpage (@) { #{{{ my $page=$params{page}; my $ext=$params{ext}; - if (IkiWiki::PageSpec::match_istranslation($page, $page)) { + if (pagespec_match($page,"istranslation()")) { my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/); if (! $config{usedirs} || $page eq 'index') { return $masterpage . "." . $lang . "." . $ext; @@ -70,6 +95,15 @@ sub targetpage (@) { #{{{ } } #}}} +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; +} #}}} + # We use filter to convert PO to the master page's type, # since other plugins should not work on PO files sub filter (@) { #{{{ @@ -79,7 +113,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 (! pagespec_match($page, "istranslation()")) { return $content; } @@ -107,6 +141,17 @@ 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};