From ea8c166a053c3c5f78e4a27f26a59f4bc9011b4e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Jul 2009 13:46:10 +0200 Subject: [PATCH] bugfix: Avoid generating po files for files that are not httmlizable --- IkiWiki/Plugin/po.pm | 3 ++- doc/plugins/po.mdwn | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index cdb9271e4..3d358b3e2 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -656,7 +656,8 @@ sub istranslatablefile ($) { my $file=shift; return 0 unless defined $file; - return 0 if defined pagetype($file) && pagetype($file) eq 'po'; + my $type=pagetype($file); + return 0 if ! defined $type || $type eq 'po'; return 0 if $file =~ /\.pot$/; return 0 unless -e "$config{srcdir}/$file"; # underlay dirs may be read-only return 1 if pagespec_match(pagename($file), $config{po_translatable_pages}); diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 7b1582dd7..98526a55a 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -250,15 +250,6 @@ once [[intrigeri]]'s `meta` branch is merged. An integration branch, called `meta-po`, merges [[intrigeri]]'s `po` and `meta` branches, and thus has thise additional features. -Misc Bugs ---------- - -If `po_translatable_pages` matches a file that is not a wiki -page, a po file will still be generated for it. There -is a missing check in there to make sure that the file is a -page. (Do it by calling `pagetype` and see if it returns a defined -value.) --[[Joey]] - Documentation -------------