store canonical strings in static-files/strings.json and autogenerate…

… our traditional JS locale files in src/locale. All unit tests pass again, and dialogs should work fine too.

.gitignore

@@ -3,5 +3,4 @@ browser-addon/chrome/webxray.js
 src/settings.local.js
 static-files/mix-master-dialog
 /locale
-/src/locale/*.json
-~/src/locale/en.json
+/src/locale

babel.ini

@@ -1,4 +1,4 @@
 [extractors]
 webxray = localization:webxray_extract
 
-[webxray: en.json]
+[webxray: strings.json]

config.json

@@ -24,7 +24,7 @@
   , "jquery/src/dimensions.js"
   , "src/get-bookmarklet-url.js"
   , "src/localization.js"
-  , "src/locale/*.json"
+  , "src/locale/*.js"
   , "src/settings.js"
   , "src/help.js"
   , "src/settings.local.js"

go.py

@@ -44,17 +44,6 @@ def get_git_commit():
     except Exception:
         return "unknown"
 
-def process_locale_json(data):
-    lines = []
-    for locale in data:
-        for scope in data[locale]:
-            lines.append("jQuery.localization.extend(%s, %s, %s);" % (
-                json.dumps(locale),
-                json.dumps(scope),
-                json.dumps(data[locale][scope])
-            ))
-    return '\n'.join(lines)
-
 def build_compiled_file(cfg):
     metadata = json.dumps(dict(commit=get_git_commit(),
                                date=time.ctime()))
@@ -69,10 +58,7 @@ def build_compiled_file(cfg):
             filenames = [path]
         for filename in filenames:
             data = open(filename, 'r').read()
-            if filename.endswith('.json'):
-                data = process_locale_json(json.loads(data))
-            else:
-                data = data.replace('__BUILD_METADATA__', metadata)
+            data = data.replace('__BUILD_METADATA__', metadata)
             contents.append(data)
     return ''.join(contents)
 
@@ -130,15 +116,16 @@ def serve(cfg, ip=''):
     elif cmd == 'globalserve':
         serve(cfg)
     elif cmd == 'compilemessages':
-        localization.compilemessages(json_dir=path('src', 'locale'),
+        localization.compilemessages(json_dir=path(cfg['staticFilesDir']),
+                                     js_locale_dir=path('src', 'locale'),
                                      locale_dir=locale_dir,
                                      locale_domain=locale_domain)
     elif cmd == 'makemessages':
         locale = None
         if len(sys.argv) > 2:
             locale = sys.argv[2]
         localization.makemessages(babel_ini_file=path('babel.ini'),
-                                  json_dir=path('src', 'locale'),
+                                  json_dir=path(cfg['staticFilesDir']),
                                   locale_dir=locale_dir,
                                   locale_domain=locale_domain,
                                   locale=locale)

vendor/localization.py

@@ -10,6 +10,17 @@
 except ImportError:
     import simplejson as json
 
+def process_locale_json(data):
+    lines = []
+    for locale in data:
+        for scope in data[locale]:
+            lines.append("jQuery.localization.extend(%s, %s, %s);" % (
+                json.dumps(locale),
+                json.dumps(scope),
+                json.dumps(data[locale][scope])
+            ))
+    return '\n'.join(lines)
+
 def webxray_extract(fileobj, keywords, comment_tags, options):
     data = json.load(fileobj)
     for locale in data:
@@ -30,35 +41,38 @@ def locale_exists(locale, dirname, domain):
                           '%s.po' % domain)
     return os.path.exists(pofile)
 
-def compilemessages(json_dir, locale_dir, locale_domain):
-    "convert message files into binary and JSON formats"
+def compilemessages(json_dir, js_locale_dir, locale_dir, locale_domain):
+    "convert message files into binary and JS formats"
 
-    data = json.load(open(os.path.join(json_dir, 'en.json')))['en']
+    data = json.load(open(os.path.join(json_dir, 'strings.json')))['en']
     babel(['compile', '--use-fuzzy', '-d', locale_dir, '-D',
            locale_domain])
-    locales = find_locales(locale_dir, locale_domain)
+    locales = find_locales(locale_dir, locale_domain) + ['en']
     for locale in locales:
         nice_locale = locale.replace('_', '-')
         print "processing localization '%s'" % nice_locale
-        trans = gettext.translation(locale_domain,
-                                    locale_dir,
-                                    [locale])
+        if locale == 'en':
+            trans = gettext.NullTranslations()
+        else:
+            trans = gettext.translation(locale_domain,
+                                        locale_dir,
+                                        [locale])
         newtrans = {}
         newtrans[locale] = {}
         for scope in data:
             scopedict = {}
             for key in data[scope]:
                 original = data[scope][key]
                 translation = trans.ugettext(original)
-                if translation != original:
+                if translation != original or locale == 'en':
                     scopedict[key] = translation
             if scopedict:
                 newtrans[locale][scope] = scopedict
         if newtrans[locale]:
-            basename = "%s.json" % nice_locale
+            basename = "%s.js" % nice_locale
             print "  writing %s" % basename
-            out = open(os.path.join(json_dir, basename), 'w')
-            out.write(json.dumps(newtrans))
+            out = open(os.path.join(js_locale_dir, basename), 'w')
+            out.write(process_locale_json(newtrans))
             out.close()
 
 def makemessages(babel_ini_file, json_dir, locale_dir,