Changeset 6a41bef in github

Timestamp:

Jan 3, 2012 11:41:34 AM (17 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

ad726a3

Parents:

e31c56a

Message:

Fix gettext importer to correctly convert launchpad .po files

File:

• bin/importgettext.sh (modified) (6 diffs)

bin/importgettext.sh

@@ -55 +55 @@
  | Author: %-62s|
  +-----------------------------------------------------------------------+
- @version $Id$
+ @version %s$
 */
 
@@ -62 +62 @@
 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')));
         }
@@ -96 +97 @@
         $out = array();
         $lines = file($fn);
-        $language = 'xx_XX';
+        $language = '';
         $translator = '';
 
@@ -164 +165 @@
         }
         
-        return $out;
+        return $language ? $out : array();
 }
 
@@ -178 +179 @@
 function expand_langcode($lang)
 {
-        static $rcube_language_aliases;
+        static $rcube_language_aliases, $rcube_languages;
 
         if (!$rcube_language_aliases)
@@ -185 +186 @@
         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