Convert region code to uppercase when generating translation file URL on Safari

safari/ext/common.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 67 matching lines @@
   /* I18n */
 
   var localeCandidates = null;
   var uiLocale;
 
   var getLocaleCandidates = function()
   {
     var candidates = [];
     var defaultLocale = "en_US";
 
-    var match = navigator.language.match(/(.*?)(?:-(.*))?$/);
-    var language = match[1];
-    var region = match[2];

[Wladimir Palant, 2014/04/10 08:05:34]

It seems that you are still trying to split the string, the following should be
more obvious:

var bits = navigator.language.split("-", 2);
var language = bits[0];
var region = bits.length > 1 ? bits[1] : null;

[Sebastian Noack, 2014/04/10 08:55:52]

Done, but I used ES6 array unpacking for better readability.

+    // e.g. "ja-jp-mac" -> "ja", "jp", note that the part after the second
+    // dash is dropped, since we only support language and region
+    var [language, region] = navigator.language.split("-");
 
     if (region)
       candidates.push(language + "_" + region.toUpperCase());
 
-    candidates.push(language, defaultLocale);
-    candidates.splice(candidates.indexOf(defaultLocale) + 1);

[Wladimir Palant, 2014/04/10 08:05:34]

I had some trouble understanding the purpose of this. So if navigator.language
is "en-us" we will return ["en_US"] rather than ["en_US", "en"]? That's
inconsistent (and - yes, it looks like the original code got it wrong as well).

I'd suggest not trying to be clever, the following code will produce consistent
results and also happens to be obvious:

if (candidates[0] != defaultLocale)
  candidates.push(defaultLocale);

[Sebastian Noack, 2014/04/10 08:55:52]

Done, but I used candidates.indexOf(defaultLocale) instead. So the code desn't
assume that defaultLocale includes a region suffix.

+    candidates.push(language);
+
+    if (candidates.indexOf(defaultLocale) == -1)
+      candidates.push(defaultLocale);
 
     return candidates;
   };
 
   var getCatalog = function(locale)
   {
     var xhr = new XMLHttpRequest();
 
     xhr.open("GET", safari.extension.baseURI + "_locales/" + locale + "/messages.json", false);
 
@@ skipping 71 matching lines @@
   };
 
 
   /* Utils */
 
   ext.getURL = function(path)
   {
     return safari.extension.baseURI + path;
   };
 })();