Merge branch 'master' of git://git.ikiwiki.info into underlay-da

diff --git a/Makefile.PL b/Makefile.PL
index b2d027bc4d8843d592e395d82f3073783bbea510..3db5c0d4063fffb54d7fdabccc61cca6b4ec3cc1 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -58,9 +58,11 @@ underlaypo: ikiwiki.out
        install -d po/underlays/directives/ikiwiki/directive
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \
+                       cp -a $$file po/underlays/directives/ikiwiki/directive ||  \
                        install -m 644 $$file po/underlays/directives/ikiwiki/directive; \
                fi \
        done
+       install -d po/underlays/empty
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup underlaypo.setup -refresh
        find po/underlays -name \*.mdwn | xargs rm -f
 

diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index 7541d102bb54234ca99401f2a37dddacc0388932..e0264dd502e4f772eda54e17df9580cd8570b62c 100644 (file)
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -2,7 +2,7 @@
      then="This wiki has po support **enabled**."
      else="This wiki has po support **disabled**."]]
 
-If the [po](plugins/po) plugin is enabled, the regular
+If the [[!iki plugins/po desc=po]] plugin is enabled, the regular
 [[ikiwiki/PageSpec]] syntax is expanded with the following additional
 tests that can be used to improve user navigation in a multi-lingual
 wiki:

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2d59c03fa6865afe8906c96d8d3f0334f3ab1556..e1cb0b5b92a0314ff277b35bdc48d710bbfe98b5 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -260,6 +260,28 @@ order, as `po_slave_languages` is a hash. It would need to be converted
 to an array to support this. (If twere done, twere best done quickly.)
 --[[Joey]] 
 
+po files in underlay
+--------------------
+
+I think this plugin doesn't yet allow po files to be present in an
+underlay to translate files also from the underlay.
+
+In `istranslatablefile`, it specifically checks that
+the file is present in srcdir. 
+
+Problem with this is that it precludes using po to translate
+the basewiki (work which is well under way for Danish BTW),
+since the translated po files cannot really be used. --[[Joey]]
+
+Duplicate %links ?
+------------------
+
+I notice code in the scan hook that seems to assume
+that %links will accumulate duplicate links for a page.
+That used to be so, but the bug was fixed. Does this mean
+that po might be replacing the only link on a page, in error? 
+--[[Joey]] 
+
 Documentation
 -------------
 

diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn
index 8c4b45141557ad604f3e52ce661c8f17c576ab89..90bfbef3b49ca6532e9cdc0351fb154e3a27fa17 100644 (file)
--- a/doc/todo/language_definition_for_the_meta_plugin.mdwn
+++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn
@@ -93,4 +93,9 @@ This may be useful for sites with a few pages in different languages, but no ful
 >> it'll need `tr/_/-/` after the optional `.encoding` is removed.
 >> --[[smcv]]
 
+>>> Now that po has been merged, this patch should probably also be adapted
+>>> so that the po plugin forces the meta::lang of every page to what po
+>>> thinks it should be. Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]]
+>>> should also work with meta-assigned languages? --[[smcv]]
+
 [[!tag wishlist patch plugins/meta translation]]

diff --git a/underlaypo.setup b/underlaypo.setup
index c0d503f49e1fa33da79b0ba979cf631fa600669c..cc8be38eac47e2dd1539e5993e87e9f08a52d534 100644 (file)
--- a/underlaypo.setup
+++ b/underlaypo.setup
@@ -8,8 +8,8 @@ use IkiWiki::Setup::Standard {
        # will excessively bloat things.
         po_slave_languages => {
                #'fr' => 'Français',
-                #'es' => 'Español',
-                #'de' => 'Deutsch',
+               #'es' => 'Español',
+               #'de' => 'Deutsch',
         },
        po_master_language => { 'code' => 'en', 'name' => 'English' },
        po_translatable_pages => "*",
@@ -20,8 +20,8 @@ use IkiWiki::Setup::Standard {
        destdir => "po/html",
        templatedir => "templates",
        # we don't want to pull in the normal underlays
-       underlaydirbase => "po/underlays",
-       underlaydir => "po/underlays/basewiki",
+       underlaydirbase => "po/underlays/empty",
+       underlaydir => "po/underlays/empty",
        discussion => 0,
        locale => '',
        verbose => 1,