po plugin: added ISTRANSLATION and ISTRANSLATABLE template variables

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 1dcec7bec268ee82a7c39a579401e9bd033c91cf..56f4162dad3db9efd054bd17256306255485798a 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -9,6 +9,7 @@ use strict;
 use IkiWiki 2.00;
 use Encode;
 use Locale::Po4a::Chooser;
 use IkiWiki 2.00;
 use Encode;
 use Locale::Po4a::Chooser;

+use Locale::Po4a::Po;

 use File::Basename;
 use File::Copy;
 use File::Spec;
 use File::Basename;
 use File::Copy;
 use File::Spec;


@@ -119,6 +120,12 @@ sub refreshpot ($) { #{{{
        $doc->{TT}{utf_mode} = 1;
        $doc->{TT}{file_in_charset} = 'utf-8';
        $doc->{TT}{file_out_charset} = 'utf-8';
        $doc->{TT}{utf_mode} = 1;
        $doc->{TT}{file_in_charset} = 'utf-8';
        $doc->{TT}{file_out_charset} = 'utf-8';

+       # let's cheat a bit to force porefs option to be passed to Locale::Po4a::Po;
+       # this is undocument use of internal Locale::Po4a::TransTractor's data,
+       # compulsory since this module prevents us from using the porefs option.
+       my %po_options = ('porefs' => 'none');
+       $doc->{TT}{po_out}=Locale::Po4a::Po->new(\%po_options);
+       # do the actual work

        $doc->parse;
        $doc->writepo($potfile);
 } #}}}
        $doc->parse;
        $doc->writepo($potfile);
 } #}}}


@@ -132,7 +139,7 @@ sub refreshpofiles ($@) { #{{{
 
        foreach my $pofile (@pofiles) {
                if (-e $pofile) {
 
        foreach my $pofile (@pofiles) {
                if (-e $pofile) {

-                       my $cmd = "msgmerge -U $pofile $potfile";
+                       my $cmd = "msgmerge -U --backup=none $pofile $potfile";

                        system ($cmd) == 0
                                or error("[po/refreshpofiles:$pofile] failed to update");
                }
                        system ($cmd) == 0
                                or error("[po/refreshpofiles:$pofile] failed to update");
                }


@@ -186,16 +193,14 @@ sub needsbuild () { #{{{
                }
                IkiWiki::refresh();
                IkiWiki::saveindex();
                }
                IkiWiki::refresh();
                IkiWiki::saveindex();

+               # refresh module's private variables

                %filtered=undef;
                %filtered=undef;

+               %translations=undef;
+               foreach my $page (keys %pagesources) {
+                       istranslation($page);
+               }

        }
 
        }
 

-       # refresh %translations, using istranslation's side-effect
-       # (not needed yet, but when newly created POT/PO files are
-       # added to %pagesources and other data structures, we'll need
-       # this)
-       foreach my $page (keys %pagesources) {
-               istranslation($page);
-       }

 
        # make existing translations depend on the corresponding master page
        foreach my $master (keys %translations) {
 
        # make existing translations depend on the corresponding master page
        foreach my $master (keys %translations) {


@@ -351,7 +356,7 @@ sub otherlanguages ($) { #{{{
                                url => urlto($translations{$masterpage}{$lang}, $page),
                                code => $lang,
                                language => $config{po_slave_languages}{$lang},
                                url => urlto($translations{$masterpage}{$lang}, $page),
                                code => $lang,
                                language => $config{po_slave_languages}{$lang},

-                               percent => percenttranslated($page),
+                               percent => percenttranslated($translations{$masterpage}{$lang}),

                        } unless ($lang eq $curlang);
                }
        }
                        } unless ($lang eq $curlang);
                }
        }


@@ -366,8 +371,26 @@ sub pagetemplate (@) { #{{{
        if (istranslation($page) && $template->query(name => "percenttranslated")) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if (istranslation($page) && $template->query(name => "percenttranslated")) {
                $template->param(percenttranslated => percenttranslated($page));
        }

+       if ($template->query(name => "istranslation")) {
+               $template->param(istranslation => istranslation($page));
+       }
+       if ($template->query(name => "istranslatable")) {
+               $template->param(istranslatable => istranslatable($page));
+       }

        if ($template->query(name => "otherlanguages")) {
                $template->param(otherlanguages => [otherlanguages($page)]);
        if ($template->query(name => "otherlanguages")) {
                $template->param(otherlanguages => [otherlanguages($page)]);

+               if (istranslatable($page)) {
+                       foreach my $translation (values %{$translations{$page}}) {
+                               add_depends($page, $translation);
+                       }
+               }
+               elsif (istranslation($page)) {
+                       my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+                       add_depends($page, $masterpage);
+                       foreach my $translation (values %{$translations{$masterpage}}) {
+                               add_depends($page, $translation);
+                       }
+               }

        }
 } # }}}
 
        }
 } # }}}