po plugin: implement linking specification in one of the main cases

[ikiwiki.git] / IkiWiki / Plugin / po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3546bef88a066bb747a3ea175e25a80718db515d..63be0e38979d23a972843ba283f5d55ab76af201 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -13,7 +13,9 @@ 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);
@@ -45,6 +47,25 @@ 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)",
+                       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_current_language} ||
+           ! defined $config{po_link_to_current_language}) {
+           $config{po_link_to_current_language}=0;
+       }
 } #}}}
 
 sub targetpage (@) { #{{{
@@ -52,7 +73,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;
@@ -71,6 +92,15 @@ sub targetpage (@) { #{{{
        }
 } #}}}
 
+sub tweakurlpath ($) { #{{{
+       my %params = @_;
+       my $url=$params{url};
+       if (! $config{po_link_to_current_language} && $config{usedirs}) {
+               $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 (@) { #{{{
@@ -80,7 +110,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;
        }