Port changes proposed by Pike in bug 1291693

Author: stasm

fluent/migrate/context.py

@@ -51,7 +51,11 @@ def __init__(self, lang, reference_dir, localization_dir):
 
         # An iterable of plural category names relevant to the context's
         # language.  E.g. ('one', 'other') for English.
-        self.plural_categories = get_plural_categories(lang)
+        try:
+            self.plural_categories = get_plural_categories(lang)
+        except RuntimeError as e:
+            print(e.message)
+            self.plural_categories = 'en'
 
         # Paths to directories with input data, relative to CWD.
         self.reference_dir = reference_dir

tools/migrate/blame.py

@@ -3,7 +3,7 @@
 import json
 import hglib
 from hglib.util import b, cmdbuilder
-from compare_locales.parser import getParser
+from compare_locales.parser import getParser, Junk
 
 
 class Blame(object):
@@ -33,7 +33,11 @@ def handleFile(self, leaf):
         entities, emap = parser.parse()
         self.blame[leaf] = {}
         for e in entities:
-            blines = blames[(e.value_position()[0] - 1):e.value_position(-1)[0]]
+            if isinstance(e, Junk):
+                continue
+            blines = blames[
+                (e.value_position()[0] - 1):e.value_position(-1)[0]
+            ]
             blines.sort(key=lambda blame: -blame['date'][0])  # ignore timezone
             blame = blines[0]
             user = blame['user']

tools/migrate/migrate-l10n.py

@@ -45,6 +45,9 @@ def main(lang, reference_dir, localization_dir, blame, migrations, dry_run):
                 fullpath = os.path.join(localization_dir, path)
                 print('  Writing to {}'.format(fullpath))
                 if not dry_run:
+                    fulldir = os.path.dirname(fullpath)
+                    if not os.path.isdir(fulldir):
+                        os.makedirs(fulldir)
                     with open(fullpath, 'w') as f:
                         f.write(content.encode('utf8'))
                         f.close()