po plugin: bugfix (OTHERLANGUAGES)

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index aa592989b659497070bcf0fc659a785e1c15921a..716aa9151e873e1e838285c3c8c160e1ef4d74b3 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -16,8 +16,10 @@ use File::Temp;
 use Memoize;
 
 my %translations;
 use Memoize;
 
 my %translations;

+our %filtered;

 memoize("istranslatable");
 memoize("_istranslation");
 memoize("istranslatable");
 memoize("_istranslation");

+memoize("percenttranslated");

 
 sub import {
        hook(type => "getsetup", id => "po", call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "po", call => \&getsetup);


@@ -95,10 +97,22 @@ sub checkconfig () { #{{{
        push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 } #}}}
 
        push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 } #}}}
 

-sub refreshpot ($) { #{{{
+sub potfile ($) { #{{{
+       my $masterfile=shift;
+       (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
+       return File::Spec->catfile($dir, $name . ".pot");
+} #}}}
+
+sub pofile ($$) { #{{{

        my $masterfile=shift;
        my $masterfile=shift;

+       my $lang=shift;

        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);

-       my $potfile=File::Spec->catfile($dir, $name . ".pot");
+       return File::Spec->catfile($dir, $name . "." . $lang . ".po");
+} #}}}
+
+sub refreshpot ($) { #{{{
+       my $masterfile=shift;
+       my $potfile=potfile($masterfile);

        my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
        my $doc=Locale::Po4a::Chooser::new('text',%options);
        $doc->read($masterfile);
        my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
        my $doc=Locale::Po4a::Chooser::new('text',%options);
        $doc->read($masterfile);


@@ -113,8 +127,7 @@ sub refreshpofiles ($@) { #{{{
        my $masterfile=shift;
        my @pofiles=@_;
 
        my $masterfile=shift;
        my @pofiles=@_;
 

-       (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-       my $potfile=File::Spec->catfile($dir, $name . ".pot");
+       my $potfile=potfile($masterfile);

        error("[po/refreshpofiles] POT file ($potfile) does not exist") unless (-e $potfile);
 
        foreach my $pofile (@pofiles) {
        error("[po/refreshpofiles] POT file ($potfile) does not exist") unless (-e $potfile);
 
        foreach my $pofile (@pofiles) {


@@ -138,19 +151,52 @@ sub needsbuild () { #{{{
                istranslation($page);
        }
 
                istranslation($page);
        }
 

-       # refresh POT and PO files as needed
-       foreach my $file (@$needsbuild) {
-               my $page=pagename($file);
+       # refresh/create POT and PO files as needed
+       my $updated_po_files=0;
+       foreach my $page (keys %pagesources) {
+               my $pageneedsbuild = grep { $_ eq $pagesources{$page} } @$needsbuild;

                if (istranslatable($page)) {
                if (istranslatable($page)) {

-                       refreshpot(srcfile($file));
+                       my $file=srcfile($pagesources{$page});
+                       if ($pageneedsbuild || ! -e potfile($file)) {
+                               refreshpot($file);
+                       }

                        my @pofiles;
                        my @pofiles;

-                       foreach my $lang (keys %{$translations{$page}}) {
-                               push @pofiles, $pagesources{$translations{$page}{$lang}};
+                       foreach my $lang (keys %{$config{po_slave_languages}}) {
+                               my $pofile=pofile($file, $lang);
+                               if ($pageneedsbuild || ! -e $pofile) {
+                                       push @pofiles, $pofile;
+                               }
+                       }
+                       if (@pofiles) {
+                               refreshpofiles($file, @pofiles) ;
+                               map { IkiWiki::rcs_add($_); } @pofiles if ($config{rcs});
+                               $updated_po_files = 1;

                        }
                        }

-                       refreshpofiles(srcfile($file), map { srcfile($_) } @pofiles);

                }
        }
 
                }
        }
 

+       # check staged changes in and trigger a wiki refresh.
+       if ($updated_po_files) {
+               if ($config{rcs}) {
+                       IkiWiki::disable_commit_hook();
+                       IkiWiki::rcs_commit_staged(gettext("updated PO files"),
+                               "refreshpofiles", "127.0.0.1");
+                       IkiWiki::enable_commit_hook();
+                       IkiWiki::rcs_update();
+               }
+               IkiWiki::refresh();
+               IkiWiki::saveindex();
+               %filtered=undef;
+       }
+
+       # 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) {
                foreach my $slave (values %{$translations{$master}}) {
        # make existing translations depend on the corresponding master page
        foreach my $master (keys %translations) {
                foreach my $slave (values %{$translations{$master}}) {


@@ -206,7 +252,6 @@ sub tweakbestlink ($$) { #{{{
        return $link;
 } #}}}
 
        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 (@) { #{{{
 # We use filter to convert PO to the master page's type,
 # since other plugins should not work on PO files
 sub filter (@) { #{{{


@@ -237,7 +282,6 @@ sub filter (@) { #{{{
                'file_in_charset'  => 'utf-8',
                'file_out_charset' => 'utf-8',
        ) or error("[po/filter:$file]: failed to translate");
                'file_in_charset'  => 'utf-8',
                'file_out_charset' => 'utf-8',
        ) or error("[po/filter:$file]: failed to translate");

-       my ($percent,$hit,$queries) = $doc->stats();

        my $tmpfh = File::Temp->new(TEMPLATE => "/tmp/ikiwiki-po-filter-out.XXXXXXXXXX");
        my $tmpout = $tmpfh->filename;
        $doc->write($tmpout) or error("[po/filter:$file] could not write $tmpout");
        my $tmpfh = File::Temp->new(TEMPLATE => "/tmp/ikiwiki-po-filter-out.XXXXXXXXXX");
        my $tmpout = $tmpfh->filename;
        $doc->write($tmpout) or error("[po/filter:$file] could not write $tmpout");


@@ -257,16 +301,40 @@ sub htmlize (@) { #{{{
        return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 
        return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
 } #}}}
 

+sub percenttranslated ($) { #{{{
+       my $page=shift;
+       return "N/A" unless (istranslation($page));
+       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+       my $file=srcfile($pagesources{$page});
+       my $masterfile = srcfile($pagesources{$masterpage});
+       my (@pos,@masters);
+       push @pos,$file;
+       push @masters,$masterfile;
+       my %options = (
+                       "markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
+                       );
+       my $doc=Locale::Po4a::Chooser::new('text',%options);
+       $doc->process(
+               'po_in_name'    => \@pos,
+               'file_in_name'  => \@masters,
+               'file_in_charset'  => 'utf-8',
+               'file_out_charset' => 'utf-8',
+       ) or error("[po/percenttranslated:$file]: failed to translate");
+       my ($percent,$hit,$queries) = $doc->stats();
+       return $percent;
+} #}}}
+

 sub otherlanguages ($) { #{{{
        my $page=shift;
        my @ret;
        if (istranslatable($page)) {
                foreach my $lang (sort keys %{$translations{$page}}) {
 sub otherlanguages ($) { #{{{
        my $page=shift;
        my @ret;
        if (istranslatable($page)) {
                foreach my $lang (sort keys %{$translations{$page}}) {

+                       my $translation = $translations{$page}{$lang};

                        push @ret, {
                        push @ret, {

-                               url => urlto($translations{$page}{$lang}, $page),
+                               url => urlto($translation, $page),

                                code => $lang,
                                language => $config{po_slave_languages}{$lang},
                                code => $lang,
                                language => $config{po_slave_languages}{$lang},

-                               master => 0,
+                               percent => percenttranslated($translation),

                        };
                }
        }
                        };
                }
        }


@@ -283,7 +351,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},

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

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


@@ -295,6 +363,9 @@ sub pagetemplate (@) { #{{{
         my $page=$params{page};
         my $template=$params{template};
 
         my $page=$params{page};
         my $template=$params{template};
 

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

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