From: intrigeri <intrigeri@boum.org>
Date: Mon, 18 Jul 2011 16:41:37 +0000 (+0200)
Subject: Merge commit '3.20110715' into prv/po
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=739554622fa1caa6bcc0474ebbdcd9db3627389d;hp=98d2356ad0e1c3bbd823ab17fb51eaa794b26713

Merge commit '3.20110715' into prv/po
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index aca3d4bf8..6410a1c66 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -343,6 +343,13 @@ sub pagetemplate (@) {
 	if ($template->query(name => "istranslatable")) {
 		$template->param(istranslatable => istranslatable($page));
 	}
+	my $lang_code = istranslation($page) ? lang($page) : $master_language_code;
+	if ($template->query(name => "lang_code")) {
+		$template->param(lang_code => $lang_code);
+	}
+	if ($template->query(name => "lang_name")) {
+		$template->param(lang_name => languagename($lang_code));
+	}
 	if ($template->query(name => "HOMEPAGEURL")) {
 		$template->param(homepageurl => homepageurl($page));
 	}
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index f91e44ea3..b701d3662 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -150,6 +150,9 @@ the wiki homepage.
 The `ISTRANSLATION` and `ISTRANSLATABLE` variables can be used to
 display things only on translatable or translation pages.
 
+The `LANG_CODE` and `LANG_NAME` variables can respectively be used to
+display the current page's language code and pretty name.
+
 ### Display page's versions in other languages
 
 The `OTHERLANGUAGES` loop provides ways to display other languages'