Merge branch 'master' into lang-options

bin/import_cldr

@@ -25,18 +25,21 @@ if (fs.existsSync(file)) {
   result = JSON.parse(fs.readFileSync(file))
 }
 
+let langListFile = JSON.parse(fs.readFileSync('lang/list.json'))
+
 let languageNames = cldr.extractLanguageDisplayNames(lang)
 
 for (let k in languageNames) {
   result['lang:' + k.replace('_', '-')] = languageNames[k]
 }
 
 if (!('lang:current' in result)) {
-  result['lang:current'] = languageNames[args.lang]
+  result['lang:current'] = languageNames[lang]
 }
 if (!('lang:base' in result)) {
   result['lang:base'] = 'en'
 }
+langListFile[lang] = languageNames[lang]
 
 let listPatterns = cldr.extractListPatterns(lang).default
 result['enumerate_start'] = listPatterns.start
@@ -51,12 +54,17 @@ if ('enumerate_last' in result) {
   delete result.enumerate_last
 }
 
-var ret = {}
-var keys = Object.keys(result)
-keys.sort()
+fs.writeFileSync(file, JSON.stringify(order(result), null, '    ') + '\n')
+fs.writeFileSync('lang/list.json', JSON.stringify(order(langListFile), null, '    ') + '\n')
 
-for (var i = 0; i < keys.length; i++) {
-  ret[keys[i]] = result[keys[i]]
-}
+function order (data) {
+  var ret = {}
+  var keys = Object.keys(data)
+  keys.sort()
 
-fs.writeFileSync(file, JSON.stringify(ret, null, '    ') + '\n')
+  for (var i = 0; i < keys.length; i++) {
+    ret[keys[i]] = data[keys[i]]
+  }
+
+  return ret
+}

lang/list.json

@@ -9,15 +9,12 @@
     "de": "Deutsch",
     "el": "Ελληνικά",
     "en": "English",
-    "enumerate_2": "{0}, {1}",
-    "enumerate_end": "{0}, {1}",
-    "enumerate_middle": "{0}, {1}",
-    "enumerate_start": "{0}, {1}",
     "es": "Español",
     "et": "Eesti",
     "fi": "suomi",
     "fr": "Français",
     "ga": "Gaeilge",
+    "gl": "galego",
     "hr": "hrvatski",
     "hu": "magyar",
     "is": "íslenska",