From: intrigeri <intrigeri@boum.org>
Date: Mon, 2 Aug 2010 10:50:40 +0000 (+0200)
Subject: po: avoid bringing duplicates into %links
X-Git-Tag: 3.20100831~33^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8a99e97ad6b02b5a5c7666dc2e98f1d6bc50550;p=ikiwiki.git

po: avoid bringing duplicates into %links
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 6b708e850..610ae664b 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -234,15 +234,15 @@ sub scan (@) {
 	my $content=$params{content};
 
 	if (istranslation($page)) {
-		foreach my $destpage (@{$links{$page}}) {
-			if (istranslatable($destpage)) {
-				# replace the occurence of $destpage in $links{$page}
-				for (my $i=0; $i<@{$links{$page}}; $i++) {
-					if (@{$links{$page}}[$i] eq $destpage) {
-						@{$links{$page}}[$i] = $destpage . '.' . lang($page);
-						last;
-					}
-				}
+		# replace the occurence of $destpage in $links{$page}
+		my @orig_links = @{$links{$page}};
+		$links{$page} = [];
+		foreach my $destpage (@orig_links) {
+			if (istranslatedto($destpage, lang($page))) {
+				add_link($page, $destpage . '.' . lang($page));
+			}
+			else {
+				add_link($page, $destpage);
 			}
 		}
 	}
@@ -251,8 +251,9 @@ sub scan (@) {
 			if (istranslatable($destpage)) {
 				# make sure any destpage's translations has
 				# $page in its backlinks
-				push @{$links{$page}},
-					values %{otherlanguages_pages($destpage)};
+				foreach my $link (values %{otherlanguages_pages($destpage)}) {
+					add_link($page, $link);
+                                }
 			}
 		}
 	}