po: ooops, fixed just introduced bug

(I just removed in istranslation and _istranslation the dependency on
istranslatable... which broke things in a subtle way, hard to see at the first
glance.)

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 402e960a3f18aa4418302b68614c04571d668e27..8ece342a80ea69f4e961da935630e05574c872d4 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -522,7 +522,8 @@ sub _istranslation ($) { #{{{
                         && defined $pagesources{$masterpage}
                         && defined $config{po_slave_languages}{$lang});
 
                         && defined $pagesources{$masterpage}
                         && defined $config{po_slave_languages}{$lang});
 

-       return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang);
+       return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
+               if istranslatable($masterpage);

 } #}}}
 
 sub istranslation ($) { #{{{
 } #}}}
 
 sub istranslation ($) { #{{{


@@ -531,7 +532,8 @@ sub istranslation ($) { #{{{
        if (1 < (my ($masterpage, $lang) = _istranslation($page))) {
                my $hasleadingslash = ($masterpage=~s#^/##);
                $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
        if (1 < (my ($masterpage, $lang) = _istranslation($page))) {
                my $hasleadingslash = ($masterpage=~s#^/##);
                $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};

-               return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang);
+               return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
+                       if istranslatable($masterpage);

        }
        return;
 } #}}}
        }
        return;
 } #}}}