From 151b18b3af52b4d736e17a76c55e0e6336c4d11b Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 3 Jan 2012 17:48:29 +0000
Subject: Fix gettext export for launchpad

git-svn-id: https://svn.roundcube.net/trunk@5696 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/bin/exportgettext.sh | 4 ++--
 1 file 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();
-- 
cgit v1.2.3