Translations: fixed a nasty bug that prevented new translations to be included

Author: Federico Fissore

arduino-core/src/processing/app/i18n/python/transifex.py

@@ -37,8 +37,7 @@ def canonical_lang(self, lang):
 
   def translation(self, lang):
     r = requests.get(
-      'http://www.transifex.com/api/2/project/'
-          'arduino-ide-15/resource/ide-15/translation/%s/?file' % lang,
+      'https://www.transifex.com/api/2/project/arduino-ide-15/resource/ide-15/translation/%s/?file' % lang,
       auth=self.auth_
     )
     r.raise_for_status()
@@ -50,13 +49,8 @@ def pull(self, lang, fname):
     new = map(lambda a: a + '\n', new.split('\n'))
     new = update.read_po(new)
 
-    # remove the key '' to preserve the first comment block.
-    first = new.pop('', ('', '', ''))  
-
     catalog = update.read_po(fname)
     update.merge(catalog, new)
-    (comment, rkey, rvalue) = catalog.get('', ('', 'msgid ""\n', ''))
-    catalog[''] = (comment, rkey, first[2])
 
     update.dump(catalog, fname)
 

arduino-core/src/processing/app/i18n/python/update.py

@@ -54,11 +54,10 @@ def dump(d, dstFile):
 
   out.close()
 
-def merge(d, dd):
-  for key in dd.keys():
-    if d.has_key(key):
-      d[key] = dd[key]
-  return d
+def merge(old, new):
+  for key in new.keys():
+    old[key] = new[key]
+  return old
 
 # Remove currently unused catalog text lines from ".po" file.
 def main():