From aed42eb34ac50912a995dee41ce7dd6e3c3b7f81 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 12 Nov 2008 17:27:53 +0100
Subject: po: fix istranslation/istranslatable for pages starting with /

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 03ee9c33c..402e960a3 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -391,11 +391,9 @@ sub mybestlink ($$) { #{{{
 	my $link=shift;
 
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
-	my $normres=$res;
-	$normres=~s#^/##;
 	if (length $res
 	    && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")
-	    && istranslatable($normres)
+	    && istranslatable($res)
 	    && istranslation($page)) {
 		return $res . "." . lang($page);
 	}
@@ -488,9 +486,18 @@ sub myurlto ($$;$) { #{{{
 # | Helper functions
 # `----
 
+sub maybe_add_leading_slash ($;$) { #{{{
+	my $str=shift;
+	my $add=shift;
+	$add=1 unless defined $add;
+	return '/' . $str if $add;
+	return $str;
+} #}}}
+
 sub istranslatable ($) { #{{{
 	my $page=shift;
 
+	$page=~s#^/##;
 	my $file=$pagesources{$page};
 
 	return 0 unless defined $file;
@@ -502,6 +509,7 @@ sub istranslatable ($) { #{{{
 sub _istranslation ($) { #{{{
 	my $page=shift;
 
+	my $hasleadingslash = ($page=~s#^/##);
 	my $file=$pagesources{$page};
 	return 0 unless (defined $file
 			 && defined pagetype($file)
@@ -514,15 +522,16 @@ sub _istranslation ($) { #{{{
 			 && defined $pagesources{$masterpage}
 			 && defined $config{po_slave_languages}{$lang});
 
-	return ($masterpage, $lang) if istranslatable($masterpage);
+	return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang);
 } #}}}
 
 sub istranslation ($) { #{{{
 	my $page=shift;
 
 	if (1 < (my ($masterpage, $lang) = _istranslation($page))) {
+		my $hasleadingslash = ($masterpage=~s#^/##);
 		$translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
-		return ($masterpage, $lang);
+		return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang);
 	}
 	return;
 } #}}}
-- 
cgit v1.2.3