aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-31 07:10:11 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-31 07:10:11 +0000
commit2dc010d66a4e29071100910a2d888895cb74bb11 (patch)
treead56c03d0ba4fa2c57d88c24f0dbf72f08d87129
parent2605d49d84ab5bb3ac2e4e0a9ff7d5d14273cd87 (diff)
downloadikiwiki-2dc010d66a4e29071100910a2d888895cb74bb11.tar
ikiwiki-2dc010d66a4e29071100910a2d888895cb74bb11.tar.gz
* Fix one more missing translation of Discussion.
-rw-r--r--IkiWiki/Plugin/inline.pm2
-rw-r--r--debian/changelog6
-rw-r--r--doc/bugs/Discussion_link_not_translated_in_post.mdwn3
3 files changed, 10 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4bdb14032..ec1cf0970 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -162,7 +162,7 @@ sub preprocess_inline (@) { #{{{
(length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) {
$template->param(have_actions => 1);
- $template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
+ $template->param(discussionlink => htmllink($page, $params{page}, gettext("Discussion"), 1, 1));
}
}
if (length $config{cgiurl} && defined $type) {
diff --git a/debian/changelog b/debian/changelog
index 32a93e1a7..b6c696960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.42) UNRELEASED; urgency=low
+
+ * Fix one more missing translation of Discussion.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 31 Jan 2007 02:08:57 -0500
+
ikiwiki (1.41) unstable; urgency=low
* Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
diff --git a/doc/bugs/Discussion_link_not_translated_in_post.mdwn b/doc/bugs/Discussion_link_not_translated_in_post.mdwn
index 500025fc0..9d69953ab 100644
--- a/doc/bugs/Discussion_link_not_translated_in_post.mdwn
+++ b/doc/bugs/Discussion_link_not_translated_in_post.mdwn
@@ -53,3 +53,6 @@ can see "Discussion" link, instead of Polish "Dyskusja" link. --Pawel
>>>>>> Not really.. I was able to reproduce the problem you desciribed and
>>>>>> my changes fixed the problem I reproduced. --[[Joey]]
+
+> Found and fixed one more, when per-post discussion links are used in a
+> blog. --[[Joey]]