po plugin: po_slave_languages is a hash, rather than a hash of hashes

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 63be0e38979d23a972843ba283f5d55ab76af201..0c95f6c14ed2ae7b8d2c7768303ba816d73ac742 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -10,14 +10,20 @@ use IkiWiki 2.00;
 use Encode;
 use Locale::Po4a::Chooser;
 use File::Temp;
 use Encode;
 use Locale::Po4a::Chooser;
 use File::Temp;

+use Memoize;
+
+my %translations;
+memoize("istranslatable");
+memoize("_istranslation");

 
 sub import {
        hook(type => "getsetup", id => "po", call => \&getsetup);
        hook(type => "checkconfig", id => "po", call => \&checkconfig);
 
 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 => "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 => "filter", id => "po", call => \&filter);

-       hook(type => "preprocess", id => "translatable", call => \&preprocess_translatable);

        hook(type => "htmlize", id => "po", call => \&htmlize);
 }
 
        hook(type => "htmlize", id => "po", call => \&htmlize);
 }
 


@@ -39,18 +45,27 @@ sub getsetup () { #{{{
                },
                po_slave_languages => {
                        type => "string",
                },
                po_slave_languages => {
                        type => "string",

-                       example => {'fr' => { 'name' => 'Français' },
-                                   'es' => { 'name' => 'Castellano' },
-                                   'de' => { 'name' => 'Deutsch' },
+                       example => {
+                               'fr' => 'Français',
+                               'es' => 'Castellano',
+                               'de' => 'Deutsch'

                        },
                        description => "slave languages (PO files)",
                        safe => 1,
                        rebuild => 1,
                },
                        },
                        description => "slave languages (PO files)",
                        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_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,
                },
                        safe => 1,
                        rebuild => 1,
                },


@@ -62,10 +77,27 @@ sub checkconfig () { #{{{
                        error(sprintf(gettext("Must specify %s"), $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;
+       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"));
+       }
+       push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
+} #}}}
+
+sub scan (@) { #{{{
+       my %params=@_;
+       my $page=$params{page};
+       # let's build %translations, using istranslation's
+       # side-effect, so that we can consider it is complete at
+       # preprocess time
+       istranslation($page);

 } #}}}
 
 sub targetpage (@) { #{{{
 } #}}}
 
 sub targetpage (@) { #{{{


@@ -73,7 +105,7 @@ sub targetpage (@) { #{{{
         my $page=$params{page};
         my $ext=$params{ext};
 
         my $page=$params{page};
         my $ext=$params{ext};
 

-       if (pagespec_match($page,"istranslation()")) {
+       if (istranslation($page)) {

                my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
                if (! $config{usedirs} || $page eq 'index') {
                        return $masterpage . "." . $lang . "." . $ext;
                my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
                if (! $config{usedirs} || $page eq 'index') {
                        return $masterpage . "." . $lang . "." . $ext;


@@ -82,7 +114,7 @@ sub targetpage (@) { #{{{
                        return $masterpage . "/index." . $lang . "." . $ext;
                }
        }
                        return $masterpage . "/index." . $lang . "." . $ext;
                }
        }

-       else {
+       elsif (istranslatable($page)) {

                if (! $config{usedirs} || $page eq 'index') {
                        return $page . "." . $config{po_master_language}{code} . "." . $ext;
                }
                if (! $config{usedirs} || $page eq 'index') {
                        return $page . "." . $config{po_master_language}{code} . "." . $ext;
                }


@@ -90,27 +122,43 @@ sub targetpage (@) { #{{{
                        return $page . "/index." . $config{po_master_language}{code} . "." . $ext;
                }
        }
                        return $page . "/index." . $config{po_master_language}{code} . "." . $ext;
                }
        }

+       return;

 } #}}}
 
 sub tweakurlpath ($) { #{{{
        my %params = @_;
        my $url=$params{url};
 } #}}}
 
 sub tweakurlpath ($) { #{{{
        my %params = @_;
        my $url=$params{url};

-       if (! $config{po_link_to_current_language} && $config{usedirs}) {
+       if ($config{po_link_to} eq "negotiated") {

                $url =~ s!/index.$config{po_master_language}{code}.$config{htmlext}$!/!;
        }
        return $url;
 } #}}}
 
                $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;
+} #}}}
+
+our %filtered;

 # We use filter to convert PO to the master page's type,
 # since other plugins should not work on PO files
 sub filter (@) { #{{{
        my %params = @_;
        my $page = $params{page};
 # We use filter to convert PO to the master page's type,
 # since other plugins should not work on PO files
 sub filter (@) { #{{{
        my %params = @_;
        my $page = $params{page};

+       my $destpage = $params{destpage};

        my $content = decode_utf8(encode_utf8($params{content}));
 
        # decide if this is a PO file that should be converted into a translated document,
        # and perform various sanity checks
        my $content = decode_utf8(encode_utf8($params{content}));
 
        # decide if this is a PO file that should be converted into a translated document,
        # and perform various sanity checks

-       if (! pagespec_match($page, "istranslation()")) {
+       if (! istranslation($page) || $filtered{$page}{$destpage}) {

                return $content;
        }
 
                return $content;
        }
 


@@ -135,20 +183,10 @@ sub filter (@) { #{{{
        my $tmpout = $tmpfh->filename;
        $doc->write($tmpout) or error("[po/filter:$file] could not write $tmpout");
        $content = readfile($tmpout) or error("[po/filter:$file] could not read $tmpout");
        my $tmpout = $tmpfh->filename;
        $doc->write($tmpout) or error("[po/filter:$file] could not write $tmpout");
        $content = readfile($tmpout) or error("[po/filter:$file] could not read $tmpout");

+       $filtered{$page}{$destpage}=1;

        return $content;
 } #}}}
 
        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};
 sub htmlize (@) { #{{{
        my %params=@_;
        my $page = $params{page};


@@ -160,38 +198,76 @@ sub htmlize (@) { #{{{
        return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 
        return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 

-package IkiWiki::PageSpec;
-
-sub match_istranslation ($;@) { #{{{
+sub istranslatable ($) { #{{{

        my $page=shift;
        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 (! 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
        }
 
        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");
+sub istranslation ($) { #{{{
+       my $page=shift;
+       if (_istranslation($page)) {
+               my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+               $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
+               return 1;

        }
        }

+       return 0;
+} #}}}

 
 

-       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::Plugin::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::Plugin::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
 } #}}}
 
 1