urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Joey Hess 2009-07-20 07:19:05 +02:00
parent 9d9826a3d2
commit e04692e059
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IkiWiki/Plugin/po.pm
View File

@ -119,20 +119,18 @@ sub getsetup () {
} }
sub checkconfig () { 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}) { if (! exists $config{$field} || ! defined $config{$field}) {
error(sprintf(gettext("Must specify %s when using the %s plugin"), error(sprintf(gettext("Must specify %s when using the %s plugin"),
$field, 'po')); $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 { map {
islanguagecode($_) islanguagecode($_)
or error(sprintf(gettext("%s is not a valid language code"), $_)); or error(sprintf(gettext("%s is not a valid language code"), $_));
} ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}); } ($config{po_master_language}{code}, keys %{$config{po_slave_languages}});
if (! exists $config{po_translatable_pages} || if (! exists $config{po_translatable_pages} ||
! defined $config{po_translatable_pages}) { ! defined $config{po_translatable_pages}) {
$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')); warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default'));
$config{po_link_to}='default'; $config{po_link_to}='default';
} }
push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/; 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 () { sub needsbuild () {