diff options
| -rwxr-xr-x | Makefile.PL | 2 | ||||
| -rw-r--r-- | doc/ikiwiki/pagespec/po.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/po.mdwn | 22 | ||||
| -rw-r--r-- | doc/todo/language_definition_for_the_meta_plugin.mdwn | 5 | ||||
| -rw-r--r-- | underlaypo.setup | 8 |
5 files changed, 34 insertions, 5 deletions
diff --git a/Makefile.PL b/Makefile.PL index b2d027bc4..3db5c0d40 100755 --- 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 7541d102b..e0264dd50 100644 --- 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 2d59c03fa..e1cb0b5b9 100644 --- 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 8c4b45141..90bfbef3b 100644 --- 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 c0d503f49..cc8be38ea 100644 --- 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, |