po: Better fix for missing underlay translation problem.

If a page is taken from the underlay, and one of the specified languages
does not have po files in the underlay, it would create a broken link
to the translated version of the page for that language.

With this change, there's no broken link.

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index ce32aab050df4d61b6a0147aa4aa1a44acc82c10..aa3d72b90ebaeaeb88a54e9f953f57cfb8e629c0 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -891,7 +891,7 @@ sub percenttranslated ($) {
        my $page=shift;
 
        $page=~s/^\///;
-       return gettext("0") unless istranslation($page);
+       return gettext("N/A") unless istranslation($page);
        my $file=srcfile($pagesources{$page});
        my $masterfile = srcfile($pagesources{masterpage($page)});
        my %options = (
@@ -934,7 +934,7 @@ sub otherlanguagesloop ($) {
                                master => 1,
                        };
                }
-               else {
+               elsif (istranslation($otherpage)) {
                        push @ret, {
                                url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
                                code => $lang,

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 684593bf321014725f857e1d21c42f7388b62be1..3766ad295a1420a454f30fb845910ca2b7d4041d 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -307,7 +307,8 @@ pages as edit links, as if those pages do not exist.
 That's really confusing, especially as clicking such a link
 brings up an edit form to create a new, english page.
 
-This is with po_link_to=current or negotiated. With default, it doesn't happen..
+This is with po_link_to=current or negotiated. With default, it doesn't
+happen.. --[[Joey]] 
 
 Double commits of po files
 --------------------------
@@ -321,7 +322,7 @@ and then committed again. The second commit makes this change:
        +"Content-Transfer-Encoding: ENCODING\n"
 
 Same thing happens when a change to an existing page triggers a po file
-update.
+update. --[[Joey]] 
 
 Documentation
 -------------