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 bits, i;
-    for (i = (bits = navigator.language.split("-")).length; i > 0; i--)
-    {
-      var locale = bits.slice(0, i).join("_");
-      candidates.push(locale);
+    // e.g. "en-us" -> "en", "us", if there are multiple dashes, the part
+    // after the second dash will be dropped, but that case doesn't exist

[Wladimir Palant, 2014/04/10 10:17:48]

Nit: use "ja-jp-mac" as example? That case does exist, we just don't want to
handle it specially.

// Note: for languages like "ja-jp-mac" consisting of three parts we drop the
third part and only consider language and region codes.

[Sebastian Noack, 2014/04/10 10:33:28]

Done.

+    var [language, region] = navigator.language.split("-");
 
-      if (locale == defaultLocale)
-        return candidates;
-    }
+    if (region)
+      candidates.push(language + "_" + region.toUpperCase());
 
-    candidates.push(defaultLocale);
+    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);
 
     try {
@@ skipping 70 matching lines @@
   };
 
 
   /* Utils */
 
   ext.getURL = function(path)
   {
     return safari.extension.baseURI + path;
   };
 })();