Merge branch 'prv/po' into pub/po

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 26bd893a91d6e20abacd1ebb22ffd68868f385b3..56f4162dad3db9efd054bd17256306255485798a 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -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)) {

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index a0c75699d583797d6451f8b992d91a449456270b..97c2e2d4e6fbdb5446142616db4b76011a95aa83 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -128,6 +128,9 @@ Usage
 Templates
 ---------
 
+The `ISTRANSLATION` and `ISTRANSLATABLE` variables can be used to
+display things only on translatable or translation pages.
+
 ### Display page's versions in other languages
 
 The `OTHERLANGUAGES` loop provides ways to display other languages'
@@ -163,6 +166,14 @@ The following variables are available inside the loop (for every page in):
 The `PERCENTTRANSLATED` variable is set to the translation
 completeness, expressed in percent, on "slave" pages.
 
+One can use it this way:
+
+       <TMPL_IF NAME="ISTRANSLATION">
+       <div id="percenttranslated">
+         <TMPL_VAR NAME="PERCENTTRANSLATED">
+       </div>
+       </TMPL_IF>
+
 Additional PageSpec tests
 -------------------------
 
@@ -221,6 +232,13 @@ gettext/po4a rough corners
   a PO update, that changes bla.fr.po in repo2; etc.; fixed in
   `629968fc89bced6727981c0a1138072631751fee` ?
 
+Misc. improvements
+------------------
+
+### page titles
+
+Use nice page titles from meta plugin in links, as inline already does.
+
 Translation quality assurance
 -----------------------------
 
@@ -239,6 +257,8 @@ Translating online
 As PO is a wiki page type, we already have an online PO editor, that
 is ikiwiki's CGI.
 
+**FIXME** preview does not work for PO files.
+
 A message-by-message interface could also be implemented at some
 point; a nice way to do offline translation work (without VCS access)
 still has to be offered, though.