JavaScriptCollection
diff --git a/‎src/locale.js‎
Lines changed: 8 additions & 7 deletions b/‎src/locale.js‎
Lines changed: 8 additions & 7 deletions
@@ -2,7 +2,8 @@ var fs = require("fs"),
     puts = require("util").puts,
     formats = {},
     kvRe = /=/,
-    valueRe = /("[^"]+")/g,
+    valueRe = /;/g,
+    quotedRe = /"([^"]+?)"/g,
     data = [];
 
 process.stdin.resume();
@@ -14,17 +15,17 @@ function write() {
   data.join("\n").split(/\n/g).forEach(function(line) {
     var i = line.match(kvRe);
     if (i && (i = i.index)) {
-      var value = line.substring(i + 1).split(valueRe);
-      formats[line.substring(0, i)] = value.length > 3
-          ? value.map(function(d, i) { return d === "" ? i ? "]" : "[" : d === ";" ? ", " : d; }).join("")
-          : value[1];
+      var value = line.substring(i + 1).replace(quotedRe, "$1").split(valueRe);
+      formats[line.substring(0, i)] = value;
     }
   });
 
   puts(fs.readFileSync(process.argv[2], "utf8").replace(/\{([^\}]+)\}/g, function(d, k) {
     d = formats[k];
     return k === "grouping"
-        ? d === "\"127\"" || d === "\"0\"" ? null : d.replace(/^"/, "[").replace(/"$/, "]").replace(/;/, ", ")
-        : d == null ? null : d;
+        ? d === "127" || d === "0" ? null : "[" + d.map(Number).join(", ") + "]"
+        : d == null ? null : d.length > 1 ? "[" + d.map(quote).join(", ") + "]" : quote(d[0]);
   }));
 }
+
+function quote(d) { return '"' + d + '"'; }