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

po: Configuring the same language as master and slave confuses processing; so filter out such a misconfiguration.

master
Joey Hess 2010-04-10 18:28:15 -04:00
parent d2c36a6f4b
commit d5eb540149
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/po.pm
View File

@ -133,6 +133,7 @@ sub checkconfig () {
$field, 'po')); $field, 'po'));
} }
} }
delete $config{po_slave_languages}{$config{po_master_language}{code}};;
map { map {
islanguagecode($_) islanguagecode($_)
@ -174,7 +175,6 @@ sub checkconfig () {
if ($config{po_master_language}{code} ne 'en') { if ($config{po_master_language}{code} ne 'en') {
# Add underlay containing translated source files # Add underlay containing translated source files
# for the master language. # for the master language.
print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
add_underlay("locale/$config{po_master_language}{code}/$underlay") add_underlay("locale/$config{po_master_language}{code}/$underlay")
if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay"; if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
} }

2
debian/changelog vendored
View File

@ -25,6 +25,8 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
* Update dependency for git-core to git transition. * Update dependency for git-core to git transition.
* po: Check that translated underlay directories exist before using them * po: Check that translated underlay directories exist before using them
for master language. for master language.
* po: Configuring the same language as master and slave confuses processing;
so filter out such a misconfiguration.
-- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400 -- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400