Merge pull request #2468 from mythmon/unicode-db-extract

Deal with unicode in l10n msgids.
mozilla · Apr 10, 2015 · 1e8f8ed · 1e8f8ed
2 parents 7f76530 + 9dba628
commit 1e8f8ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,6 +7,7 @@
     -   id: check-merge-conflict
     -   id: check-yaml
     -   id: debug-statements
+    -   id: trailing-whitespace
     -   id: flake8
         exclude: "\
             (.*migrations.*)|\
@@ -20,4 +21,3 @@
             (scripts/sprint_report.py)|\
             (scripts/year_in_review.py)"
         args: [--max-line-length=99]
-    -   id: trailing-whitespace
diff --git a/kitsune/sumo/management/commands/extract_db.py b/kitsune/sumo/management/commands/extract_db.py
@@ -74,6 +74,7 @@ def handle(self, *args, **options):
                 comments = s['comments']
                 if comments:
                     for c in comments:
-                        f.write('# {comment}\n'.format(comment=c))
-                f.write('_("""{id}""", "{context}")\n'.format(
-                    id=s['id'], context=s['context']))
+                        f.write(u'# {comment}\n'.format(comment=c).encode('utf8'))
+
+                f.write(u'_("""{id}""", "{context}")\n'.format(id=s['id'], context=s['context'])
+                        .encode('utf8'))