From e04692e059c41e5616ead2f198ed498ec3a2f290 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Jul 2009 07:19:05 +0200 Subject: po: Support running with a non-english master lang; add translated underlays It seem to make sense to remove the check for there being slave languages as part of this, since one might want a wiki that is only in non-English. --- IkiWiki/Plugin/po.pm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 2939bcd9a..5d2d42d3b 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -119,20 +119,18 @@ sub getsetup () { } sub checkconfig () { - foreach my $field (qw{po_master_language po_slave_languages}) { + foreach my $field (qw{po_master_language}) { if (! exists $config{$field} || ! defined $config{$field}) { error(sprintf(gettext("Must specify %s when using the %s plugin"), $field, 'po')); } } - if (! (keys %{$config{po_slave_languages}})) { - error(gettext("At least one slave language must be defined ". - "in po_slave_languages when using the po plugin")); - } + map { islanguagecode($_) or error(sprintf(gettext("%s is not a valid language code"), $_)); } ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}); + if (! exists $config{po_translatable_pages} || ! defined $config{po_translatable_pages}) { $config{po_translatable_pages}=""; @@ -150,7 +148,16 @@ sub checkconfig () { warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default')); $config{po_link_to}='default'; } + push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/; + + if ($config{po_master_language}{code} ne 'en') { + # use translated underlay directories in preference + # to the untranslated ones + foreach my $underlay ('basewiki', reverse @{$config{underlaydirs}}) { + add_underlay("locale/".$config{po_master_language}{code}."/".$underlay); + } + } } sub needsbuild () { -- cgit v1.2.3