X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c8330da6c050918eaea4a441ba2ed59258f49494..0791e5afe3d8405132adcfd1ebaa8b76d0def3fc:/IkiWiki/Plugin/po.pm diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index fea4ca6eb..e33133857 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -15,6 +15,7 @@ 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); @@ -46,10 +47,10 @@ sub getsetup () { #{{{ safe => 1, rebuild => 1, }, - po_link_to_current_language => { - type => "boolean", - example => 1, - description => "internal links point to pages in the current language (useful if Content Negotiation is not supported)", + po_link_to => { + type => "string", + example => "current", + description => "internal linking behavior (default/current/negotiated)", safe => 1, rebuild => 1, }, @@ -61,9 +62,12 @@ sub checkconfig () { #{{{ error(sprintf(gettext("Must specify %s"), $field)); } } - if (! exists $config{po_link_to_current_language} || - ! defined $config{po_link_to_current_language}) { - $config{po_link_to_current_language}=0; + 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")); } } #}}} @@ -81,7 +85,7 @@ sub targetpage (@) { #{{{ return $masterpage . "/index." . $lang . "." . $ext; } } - else { + elsif (pagespec_match($page,"istranslatable()")) { if (! $config{usedirs} || $page eq 'index') { return $page . "." . $config{po_master_language}{code} . "." . $ext; } @@ -89,6 +93,16 @@ 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; } #}}} # We use filter to convert PO to the master page's type, @@ -151,18 +165,21 @@ sub htmlize (@) { #{{{ } #}}} package IkiWiki::PageSpec; +use warnings; +use strict; +use IkiWiki 2.00; sub match_istranslation ($;@) { #{{{ my $page=shift; my $wanted=shift; my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : $pagesources{$page}; if (! defined $file) { return IkiWiki::FailReason->new("no file specified"); } - if (! IkiWiki::pagetype($page) eq 'po') { + if (! defined pagetype($file) || ! pagetype($file) eq 'po') { return IkiWiki::FailReason->new("is not a PO file"); } @@ -172,16 +189,45 @@ sub match_istranslation ($;@) { #{{{ return IkiWiki::FailReason->new("is not named like a translation file"); } - if (! defined $IkiWiki::pagesources{$masterpage}) { + if (! defined $pagesources{$masterpage}) { return IkiWiki::FailReason->new("the master page does not exist"); } - if (! defined $IkiWiki::config{po_slave_languages}{$lang}) { + if (! defined $config{po_slave_languages}{$lang}) { return IkiWiki::FailReason->new("language $lang is not supported"); } return IkiWiki::SuccessReason->new("page $page is a translation"); +} #}}} + +sub match_istranslatable ($;@) { #{{{ + my $page=shift; + my $wanted=shift; + + my %params=@_; + my $file=exists $params{file} ? $params{file} : $pagesources{$page}; + if (! defined $file) { + return IkiWiki::FailReason->new("no file specified"); + } + + if (defined pagetype($file) && pagetype($file) eq 'po') { + return IkiWiki::FailReason->new("is a PO file"); + } + if ($file =~ /\.pot$/) { + return IkiWiki::FailReason->new("is a POT file"); + } + + foreach my $registering_page (keys %pagestate) { + if (exists $pagestate{$registering_page}{po_translatable}) { + foreach my $pagespec (sort keys %{$pagestate{$registering_page}{po_translatable}}) { + if (pagespec_match($page, $pagespec, location => $registering_page)) { + return IkiWiki::SuccessReason->new("is set as translatable on $registering_page"); + } + } + } + } + return IkiWiki::FailReason->new("is not set as translatable"); } #}}} 1