X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/950c29679df8f8f2f20e150896dc7ec686f123e8..7b28deb171455a207e536b8abebbca67242a4588:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 127d6d47f..0902322e3 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -35,7 +35,6 @@ sub import {
 	hook(type => "getsetup", id => "po", call => \&getsetup);
 	hook(type => "checkconfig", id => "po", call => \&checkconfig);
 	hook(type => "needsbuild", id => "po", call => \&needsbuild);
-	hook(type => "tweakurlpath", id => "po", call => \&tweakurlpath);
 	hook(type => "filter", id => "po", call => \&filter);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 	hook(type => "pagetemplate", id => "po", call => \&pagetemplate);
@@ -226,7 +225,7 @@ sub mytargetpage ($$) { #{{{
 
 	if (istranslation($page)) {
 		my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-		if (! $config{usedirs} || $page eq 'index') {
+		if (! $config{usedirs} || $masterpage eq 'index') {
 			return $masterpage . "." . $lang . "." . $ext;
 		}
 		else {
@@ -253,6 +252,17 @@ sub mybeautify_urlpath ($) { #{{{
 	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;
@@ -360,7 +370,7 @@ sub otherlanguages ($) { #{{{
 	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,