Merge commit '3.20110715' into prv/po

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index aca3d4bf86cf52afbe517ef43f83fdbc731a0eee..6410a1c663ceba0b615a6d3959bb27c3dd20b609 100644 (file)
--- 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 f91e44ea317d1b0bd9655f545541d1d55ad0aa66..b701d3662e16e2ecb4f45f379169bf2cab2a2123 100644 (file)
--- 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'