po plugin: add po_link_to_current_language option, check config

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 351b9c1550ad3b7231cfa113f2c5dc6262698d15..fea4ca6ebc6578c5b6ba3979ab2ecdea7de1f12e 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -13,8 +13,10 @@ 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 => "filter", id => "po", call => \&filter);
+       hook(type => "preprocess", id => "translatable", call => \&preprocess_translatable);
        hook(type => "htmlize", id => "po", call => \&htmlize);
 }
 
@@ -44,6 +46,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 (@) { #{{{
@@ -51,16 +72,22 @@ sub targetpage (@) { #{{{
         my $page=$params{page};
         my $ext=$params{ext};
 
-       if (! IkiWiki::PageSpec::match_istranslation($page, $page)) {
-               return;
-       }
-
-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       if (! $config{usedirs} || $page eq 'index') {
-               return $masterpage.".".$ext.".".$lang;
+       if (pagespec_match($page,"istranslation()")) {
+               my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+               if (! $config{usedirs} || $page eq 'index') {
+                       return $masterpage . "." . $lang . "." . $ext;
+               }
+               else {
+                       return $masterpage . "/index." . $lang . "." . $ext;
+               }
        }
        else {
-               return $masterpage."/index.".$ext.".".$lang;
+               if (! $config{usedirs} || $page eq 'index') {
+                       return $page . "." . $config{po_master_language}{code} . "." . $ext;
+               }
+               else {
+                       return $page . "/index." . $config{po_master_language}{code} . "." . $ext;
+               }
        }
 } #}}}
 
@@ -73,7 +100,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;
        }
 
@@ -101,6 +128,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};