Merge commit 'origin/master' into prv/po

[git.ikiwiki.info.git] / IkiWiki / Plugin / po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 26bd893a91d6e20abacd1ebb22ffd68868f385b3..f535ebd397d73b23042b522e1aa8cd2b8178e31c 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -47,7 +47,7 @@ sub getsetup () { #{{{
                                'name' => 'English'
                        },
                        description => "master language (non-PO files)",
-                       safe => 1,
+                       safe => 0,
                        rebuild => 1,
                },
                po_slave_languages => {
@@ -58,7 +58,7 @@ sub getsetup () { #{{{
                                'de' => 'Deutsch'
                        },
                        description => "slave languages (PO files)",
-                       safe => 1,
+                       safe => 0,
                        rebuild => 1,
                },
                po_translatable_pages => {
@@ -66,14 +66,14 @@ sub getsetup () { #{{{
                        example => "!*/Discussion",
                        description => "PageSpec controlling which pages are translatable",
                        link => "ikiwiki/PageSpec",
-                       safe => 1,
+                       safe => 0,
                        rebuild => 1,
                },
                po_link_to => {
                        type => "string",
                        example => "current",
                        description => "internal linking behavior (default/current/negotiated)",
-                       safe => 1,
+                       safe => 0,
                        rebuild => 1,
                },
 } #}}}
@@ -371,6 +371,12 @@ sub pagetemplate (@) { #{{{
        if (istranslation($page) && $template->query(name => "percenttranslated")) {
                $template->param(percenttranslated => percenttranslated($page));
        }
+       if ($template->query(name => "istranslation")) {
+               $template->param(istranslation => istranslation($page));
+       }
+       if ($template->query(name => "istranslatable")) {
+               $template->param(istranslatable => istranslatable($page));
+       }
        if ($template->query(name => "otherlanguages")) {
                $template->param(otherlanguages => [otherlanguages($page)]);
                if (istranslatable($page)) {