summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-04-09 18:43:25 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-04-09 18:43:25 -0400
commitd1a616df2ed79b1602658c5d10d54ee00afc537e (patch)
tree2a1b2a248e41ff19bb18af9a34e8f3ac35045f30
parent1c1c76c53e1d0e713e470bb6542c5cc3cef20ad2 (diff)
po: Check that translated underlay directories exist before using them for master language.
-rw-r--r--IkiWiki/Plugin/po.pm4
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 2250a7f9f..00c58fbe5 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -174,7 +174,9 @@ sub checkconfig () {
if ($config{po_master_language}{code} ne 'en') {
# Add underlay containing translated source files
# for the master language.
- add_underlay("locale/$config{po_master_language}{code}/$underlay");
+print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
+ add_underlay("locale/$config{po_master_language}{code}/$underlay")
+ if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
}
}
}
diff --git a/debian/changelog b/debian/changelog
index e14cc91f5..e985a5da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
[ Joey Hess ]
* Update dependency for git-core to git transition.
+ * po: Check that translated underlay directories exist before using them
+ for master language.
-- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400