summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2012-01-03 17:48:29 +0000
committerthomascube <thomas@roundcube.net>2012-01-03 17:48:29 +0000
commitc5329337b7eaf5f1f3e23bc95a3460c9eadbe1a1 (patch)
tree10be4aad47b687769d8bcea9486b1a32289bf6d6
parentad726a3f1b01f9182fde1f320faabab5881e633e (diff)
Fix gettext export for launchpad
-rwxr-xr-xbin/exportgettext.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/exportgettext.sh b/bin/exportgettext.sh
index 67fa7ad10..6a07ed2f5 100755
--- a/bin/exportgettext.sh
+++ b/bin/exportgettext.sh
@@ -175,7 +175,7 @@ function convert_file($fn, $outfn)
}
include($fn);
- $texts = $labels ? $labels : $messages;
+ $texts = array_merge($labels, $messages);
// write header
$header = <<<EOF
@@ -196,7 +196,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\\n"
EOF;
- $out = sprintf($header, $srcname, $product, $is_pot ? "POT-Creation-Date" : "PO-Revision-Date", date('c'), $lang);
+ $out = sprintf($header, $srcname, $product, $is_pot ? "POT-Creation-Date" : "PO-Revision-Date", date('c'), $shortlang ? $shortlang : $lang);
$out .= "\n";
$messages = array();