Merge branch 'prv/po' into pub/po

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 88f8194fbe7cb70bb93c15c74dd14a1dbe96ae5a..0902322e31be9fbe5d41dba47fe75e3384f37e48 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -252,6 +252,17 @@ sub mybeautify_urlpath ($) { #{{{
        return $res;
 } #}}}
 
        return $res;
 } #}}}
 

+sub urlto_with_orig_beautiful_urlpath($$) { #{{{
+       my $to=shift;
+       my $from=shift;
+
+       inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'});
+       my $res=urlto($to, $from);
+       inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
+
+       return $res;
+} #}}}
+

 sub mybestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;
 sub mybestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;


@@ -359,7 +370,7 @@ sub otherlanguages ($) { #{{{
        elsif (istranslation($page)) {
                my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
                push @ret, {
        elsif (istranslation($page)) {
                my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
                push @ret, {

-                       url => urlto($masterpage, $page),
+                       url => urlto_with_orig_beautiful_urlpath($masterpage, $page),

                        code => $config{po_master_language}{code},
                        language => $config{po_master_language}{name},
                        master => 1,
                        code => $config{po_master_language}{code},
                        language => $config{po_master_language}{name},
                        master => 1,