From 6a41bef07d855706e5f9e708e6c83f2e5da69b32 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 03 Jan 2012 11:41:34 -0500
Subject: [PATCH] Fix gettext importer to correctly convert launchpad .po files
---
bin/importgettext.sh | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/bin/importgettext.sh b/bin/importgettext.sh
index d9c34ec..f16f637 100755
--- a/bin/importgettext.sh
+++ b/bin/importgettext.sh
@@ -54,17 +54,18 @@
+-----------------------------------------------------------------------+
| Author: %-62s|
+-----------------------------------------------------------------------+
- @version $Id$
+ @version %s$
*/
$%s = array();
EOF;
- $output = sprintf($header, $lang, $varname.'.inc', date('Y'), $texts['_translator'], $varname);
+ $output = sprintf($header, $lang, $varname.'.inc', date('Y'), $texts['_translator'], '$Id', $varname);
foreach ($texts as $label => $value) {
- if ($label[0] != '_')
+ if (is_array($value)) { var_dump($outfn, $label, $value); exit; }
+ if ($label[0] != '_' && strlen($value))
$output .= sprintf("\$%s['%s'] = '%s';\n", $varname, $label, strtr(addcslashes($value, "'"), array("\r" => '', "\n" => '\n')));
}
@@ -95,7 +96,7 @@
{
$out = array();
$lines = file($fn);
- $language = 'xx_XX';
+ $language = '';
$translator = '';
$is_header = true;
@@ -163,7 +164,7 @@
}
}
- return $out;
+ return $language ? $out : array();
}
@@ -177,14 +178,14 @@
*/
function expand_langcode($lang)
{
- static $rcube_language_aliases;
+ static $rcube_language_aliases, $rcube_languages;
if (!$rcube_language_aliases)
include(INSTALL_PATH . 'program/localization/index.inc');
if ($rcube_language_aliases[$lang])
return $rcube_language_aliases[$lang];
- else if (strlen($lang) == 2)
+ else if (strlen($lang) == 2 && !isset($rcube_languages[$lang]))
return strtolower($lang) . '_' . strtoupper($lang);
else
return $lang;
--
Gitblit v1.9.1