aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-09-13 16:48:12 -0400
committerJoey Hess <joey@kitenet.net>2010-09-13 16:48:12 -0400
commita4b4b464d27490d3868e8430a6f833b54a625cad (patch)
tree501626bec57198098cad973888d8532a0c2902ae
parent20239007a73175ab9567a84339102b6085b02e31 (diff)
downloadikiwiki-a4b4b464d27490d3868e8430a6f833b54a625cad.tar
ikiwiki-a4b4b464d27490d3868e8430a6f833b54a625cad.tar.gz
further fixes for config data structure change
-rwxr-xr-xpo/po2wiki3
-rw-r--r--po/underlay.setup16
2 files changed, 10 insertions, 9 deletions
diff --git a/po/po2wiki b/po/po2wiki
index 116abbfec..126aa8e17 100755
--- a/po/po2wiki
+++ b/po/po2wiki
@@ -22,7 +22,8 @@ foreach my $file (@$files) {
$pagesources{$page}=$file; # used by po plugin functions
}
-foreach my $ll (@{$config{po_slave_languages}}) {
+foreach my $lang (@{$config{po_slave_languages}}) {
+ my ($ll, $name)=IkiWiki::Plugin::po::splitlangpair($lang);
$config{destdir}="../underlays/locale/$ll";
foreach my $file (@$files) {
diff --git a/po/underlay.setup b/po/underlay.setup
index 8d3516cff..ebe7251cf 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -6,14 +6,14 @@ use IkiWiki::Setup::Standard {
# List here all languages that have translations.
# Listing languages without active translations
# will excessively bloat things.
- po_slave_languages => {
- 'es' => 'Español',
- 'de' => 'Deutsch',
- 'fr' => 'Français',
- 'da' => 'Dansk',
- 'cs' => 'česky',
- },
- po_master_language => { 'code' => 'en', 'name' => 'English' },
+ po_slave_languages => [
+ 'es|Español',
+ 'de|Deutsch',
+ 'fr|Français',
+ 'da|Dansk',
+ 'cs|česky',
+ ],
+ po_master_language => 'en|English',
po_translatable_pages => "*",
add_plugins => [qw{po}],