summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-03 17:48:29 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-03 17:48:29 +0000
commit151b18b3af52b4d736e17a76c55e0e6336c4d11b (patch)
tree64abb4a90f92160f562c84d5c2a30002ab3ec752
parent06037f07268da28cedd89d0e94b3d431d026afd6 (diff)
Fix gettext export for launchpad
git-svn-id: https://svn.roundcube.net/trunk@5696 208e9e7b-5314-0410-a742-e7e81cd9613c
-rwxr-xr-xroundcubemail/bin/exportgettext.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/bin/exportgettext.sh b/roundcubemail/bin/exportgettext.sh
index 67fa7ad10..6a07ed2f5 100755
--- a/roundcubemail/bin/exportgettext.sh
+++ b/roundcubemail/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();