X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/439ba4490acbeafe6206d8723901e16ddcfc611a..e54ec757d01fd77001fc5efe1942bdeea8ee468f:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 4608f59c7..9dda8c0db 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -134,6 +134,7 @@ sub refreshpot ($) { #{{{
 	# compulsory since this module prevents us from using the porefs option.
 	my %po_options = ('porefs' => 'none');
 	$doc->{TT}{po_out}=Locale::Po4a::Po->new(\%po_options);
+	$doc->{TT}{po_out}->set_charset('utf-8');
 	# do the actual work
 	$doc->parse;
 	$doc->writepo($potfile);
@@ -203,8 +204,8 @@ sub needsbuild () { #{{{
 		IkiWiki::refresh();
 		IkiWiki::saveindex();
 		# refresh module's private variables
-		%filtered=undef;
-		%translations=undef;
+		undef %filtered;
+		undef %translations;
 		foreach my $page (keys %pagesources) {
 			istranslation($page);
 		}
@@ -225,7 +226,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 {
@@ -252,6 +253,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;
@@ -359,7 +371,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,
@@ -379,6 +391,7 @@ sub otherlanguages ($) { #{{{
 sub pagetemplate (@) { #{{{
 	my %params=@_;
         my $page=$params{page};
+        my $destpage=$params{destpage};
         my $template=$params{template};
 
 	if (istranslation($page) && $template->query(name => "percenttranslated")) {
@@ -405,6 +418,24 @@ sub pagetemplate (@) { #{{{
 			}
 		}
 	}
+	# Rely on IkiWiki::Render's genpage() to decide wether
+	# a discussion link should appear on $page; this is not
+	# totally accurate, though: some broken links may be generated
+	# when cgiurl is disabled.
+	# This compromise avoids some code duplication, and will probably
+	# prevent future breakage when ikiwiki internals change.
+	# Known limitations are preferred to future random bugs.
+	if ($template->param('discussionlink') && istranslation($page)) {
+		my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+		$template->param('discussionlink' => htmllink(
+							$page,
+							$destpage,
+							$masterpage . '/' . gettext("Discussion"),
+							noimageinline => 1,
+							forcesubpage => 0,
+							linktext => gettext("Discussion"),
+							));
+	}
 } # }}}
 
 sub istranslatable ($) { #{{{