Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 7795719848e670eb4cc338633b74d057f1e61486..936fe3c491d34250ce1b46e5ca32101083df9435 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -19,11 +19,12 @@ use Memoize;
 my %translations;
 our %filtered;
 
 my %translations;
 our %filtered;
 

-## FIXME: makes some test cases cry once every two tries; this may be
-## related to the artificial way the testsuite is run, or not.
-# memoize("istranslatable");

 memoize("_istranslation");
 memoize("percenttranslated");
 memoize("_istranslation");
 memoize("percenttranslated");

+# FIXME: memoizing istranslatable() makes some test cases fail once every
+# two tries; this may be related to the artificial way the testsuite is
+# run, or not.
+# memoize("istranslatable");

 
 # backup references to subs that will be overriden
 my %origsubs;
 
 # backup references to subs that will be overriden
 my %origsubs;


@@ -37,7 +38,7 @@ sub import {
        hook(type => "needsbuild", id => "po", call => \&needsbuild);
        hook(type => "filter", id => "po", call => \&filter);
        hook(type => "htmlize", id => "po", call => \&htmlize);
        hook(type => "needsbuild", id => "po", call => \&needsbuild);
        hook(type => "filter", id => "po", call => \&filter);
        hook(type => "htmlize", id => "po", call => \&htmlize);

-       hook(type => "pagetemplate", id => "po", call => \&pagetemplate);
+       hook(type => "pagetemplate", id => "po", call => \&pagetemplate, last => 1);

        hook(type => "editcontent", id => "po", call => \&editcontent);
        inject(name => "IkiWiki::bestlink", call => \&mybestlink);
        inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
        hook(type => "editcontent", id => "po", call => \&editcontent);
        inject(name => "IkiWiki::bestlink", call => \&mybestlink);
        inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);


@@ -111,14 +112,16 @@ sub checkconfig () { #{{{
 sub potfile ($) { #{{{
        my $masterfile=shift;
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
 sub potfile ($) { #{{{
        my $masterfile=shift;
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);

-       return File::Spec->catfile($dir, $name . ".pot");
+       $dir='' if $dir eq './';
+       return File::Spec->catpath('', $dir, $name . ".pot");

 } #}}}
 
 sub pofile ($$) { #{{{
        my $masterfile=shift;
        my $lang=shift;
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
 } #}}}
 
 sub pofile ($$) { #{{{
        my $masterfile=shift;
        my $lang=shift;
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);

-       return File::Spec->catfile($dir, $name . "." . $lang . ".po");
+       $dir='' if $dir eq './';
+       return File::Spec->catpath('', $dir, $name . "." . $lang . ".po");

 } #}}}
 
 sub refreshpot ($) { #{{{
 } #}}}
 
 sub refreshpot ($) { #{{{


@@ -172,17 +175,22 @@ sub needsbuild () { #{{{
        # refresh/create POT and PO files as needed
        my $updated_po_files=0;
        foreach my $page (keys %pagesources) {
        # 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)) {

+                       my $pageneedsbuild = grep { $_ eq $pagesources{$page} } @$needsbuild;
+                       my $updated_pot_file=0;

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

+                               $updated_pot_file=1;

                        }
                        my @pofiles;
                        foreach my $lang (keys %{$config{po_slave_languages}}) {
                                my $pofile=pofile($file, $lang);
                        }
                        my @pofiles;
                        foreach my $lang (keys %{$config{po_slave_languages}}) {
                                my $pofile=pofile($file, $lang);

-                               if ($pageneedsbuild || ! -e $pofile) {
+                               my $pofile_rel=pofile($pagesources{$page}, $lang);
+                               if ($pageneedsbuild || $updated_pot_file || ! -e $pofile) {

                                        push @pofiles, $pofile;
                                        push @pofiles, $pofile;

+                                       push @$needsbuild, $pofile_rel
+                                         unless grep { $_ eq $pofile_rel } @$needsbuild;

                                }
                        }
                        if (@pofiles) {
                                }
                        }
                        if (@pofiles) {


@@ -193,7 +201,7 @@ sub needsbuild () { #{{{
                }
        }
 
                }
        }
 

-       # check staged changes in and trigger a wiki refresh.
+       # check staged changes in

        if ($updated_po_files) {
                if ($config{rcs}) {
                        IkiWiki::disable_commit_hook();
        if ($updated_po_files) {
                if ($config{rcs}) {
                        IkiWiki::disable_commit_hook();


@@ -202,8 +210,6 @@ sub needsbuild () { #{{{
                        IkiWiki::enable_commit_hook();
                        IkiWiki::rcs_update();
                }
                        IkiWiki::enable_commit_hook();
                        IkiWiki::rcs_update();
                }

-               IkiWiki::refresh();
-               IkiWiki::saveindex();

                # refresh module's private variables
                undef %filtered;
                undef %translations;
                # refresh module's private variables
                undef %filtered;
                undef %translations;


@@ -212,7 +218,6 @@ sub needsbuild () { #{{{
                }
        }
 
                }
        }
 

-

        # 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}}) {


@@ -397,9 +402,10 @@ sub otherlanguages ($) { #{{{
 
 sub pagetemplate (@) { #{{{
        my %params=@_;
 
 sub pagetemplate (@) { #{{{
        my %params=@_;

-        my $page=$params{page};
-        my $destpage=$params{destpage};
-        my $template=$params{template};
+       my $page=$params{page};
+       my $destpage=$params{destpage};
+       my $template=$params{template};
+       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/) if istranslation($page);

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


@@ -418,7 +424,6 @@ sub pagetemplate (@) { #{{{
                        }
                }
                elsif (istranslation($page)) {
                        }
                }
                elsif (istranslation($page)) {

-                       my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);

                        add_depends($page, $masterpage);
                        foreach my $translation (values %{$translations{$masterpage}}) {
                                add_depends($page, $translation);
                        add_depends($page, $masterpage);
                        foreach my $translation (values %{$translations{$masterpage}}) {
                                add_depends($page, $translation);


@@ -433,7 +438,6 @@ sub pagetemplate (@) { #{{{
        # prevent future breakage when ikiwiki internals change.
        # Known limitations are preferred to future random bugs.
        if ($template->param('discussionlink') && istranslation($page)) {
        # prevent future breakage when ikiwiki internals change.
        # Known limitations are preferred to future random bugs.
        if ($template->param('discussionlink') && istranslation($page)) {

-               my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);

                $template->param('discussionlink' => htmllink(
                                                        $page,
                                                        $destpage,
                $template->param('discussionlink' => htmllink(
                                                        $page,
                                                        $destpage,


@@ -443,6 +447,12 @@ sub pagetemplate (@) { #{{{
                                                        linktext => gettext("Discussion"),
                                                        ));
        }
                                                        linktext => gettext("Discussion"),
                                                        ));
        }

+       # remove broken parentlink to ./index.html on home page's translations
+       if ($template->param('parentlinks')
+           && istranslation($page)
+           && $masterpage eq "index") {
+               $template->param('parentlinks' => []);
+       }

 } # }}}
 
 sub editcontent () { #{{{
 } # }}}
 
 sub editcontent () { #{{{