po/todo: first pass of robustness tests, added todo for remove/rename

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 402e960a3f18aa4418302b68614c04571d668e27..1212181ca39b5747cbc9ac635e66f1af6ea885c8 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -262,10 +262,14 @@ sub htmlize (@) { #{{{
 
        my $page = $params{page};
        my $content = $params{content};
 
        my $page = $params{page};
        my $content = $params{content};

-       my $masterfile = srcfile($pagesources{masterpage($page)});
+
+       # ignore PO files this plugin did not create
+       return $content unless istranslation($page);

 
        # force content to be htmlize'd as if it was the same type as the master page
 
        # force content to be htmlize'd as if it was the same type as the master page

-       return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
+       return IkiWiki::htmlize($page, $page,
+                               pagetype(srcfile($pagesources{masterpage($page)})),
+                               $content);

 } #}}}
 
 sub pagetemplate (@) { #{{{
 } #}}}
 
 sub pagetemplate (@) { #{{{


@@ -522,7 +526,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 +536,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;
 } #}}}