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 66 matching lines @@
 
   /* I18n */
 
   var localeCandidates = null;
   var uiLocale;
 
   var getLocaleCandidates = function()
   {
     var candidates = [];
     var defaultLocale = "en_US";
+    var [language, region] = navigator.language.split("-");

[Wladimir Palant, 2014/04/10 09:18:48]

My code was using split("-", 2) - did you remove the second parameter
intentionally? I can see arguments both for and against keeping it, but at the
very least you should comment that the third component in navigator.language
will be dropped if present.

[Sebastian Noack, 2014/04/10 09:55:22]

The third component would be dropped anyway, since "foo-bar-baz".split("-", 2)
is basically the same as "foo-bar-baz".split("-").slice(0, 2) in JavaScript.

That's why I initially preferred a regex, to don't silently drop the remaining
components.

[Wladimir Palant, 2014/04/10 10:02:09]

You are right, I got spoiled by Python. So we would actually do region =
bits.slice(1).join("_") here. Not that it really makes sense however given that
neither Safari nor Chrome support languages with three components IMHO - and you
would actually need to add multiple candidates here in order to fall back to
ab_XY format. So it makes sense to drop the third component, just with a
comment.

[Sebastian Noack, 2014/04/10 10:12:24]

Done.

 
-    var bits, i;
-    for (i = (bits = navigator.language.split("-")).length; i > 0; i--)
-    {
-      var locale = bits.slice(0, i).join("_");
-      candidates.push(locale);
+    if (region)
+      candidates.push(language + "_" + region.toUpperCase());
 
-      if (locale == defaultLocale)
-        return candidates;
-    }
+    candidates.push(language);
 
-    candidates.push(defaultLocale);
+    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;
   };
 })();