Issue 2008 - Handle language codes without region on Safari

safari/ext/common.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 84 matching lines @@
   /* I18n */
 
   var getLocaleCandidates = function()
   {
     var candidates = [];
     var defaultLocale = "en_US";
 
     // 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("-");
-    region = region.toUpperCase();
-
-    // e.g. "es-AR" -> "es_419", note that we combine all dialects of
-    // Spanish outside of Spain, the same way Google Chrome does,
-    // since we use the same translations as for the Chrome extension
-    if (language == "es" && region && region != "ES")
-      region = "419";
 
     if (region)
+    {
+      region = region.toUpperCase();
+
+      // e.g. "es-AR" -> "es_419", note that we combine all dialects of
+      // Spanish outside of Spain, the same way Google Chrome does,
+      // since we use the same translations as for the Chrome extension
+      if (language == "es" && region != "ES")
+        region = "419";
+
       candidates.push(language + "_" + region);
+    }
 
     candidates.push(language);
 
     if (candidates.indexOf(defaultLocale) == -1)
       candidates.push(defaultLocale);
 
     return candidates;
   };
 
   var initCatalog = function(uiLocale)
@@ skipping 86 matching lines @@
   };
 
 
   /* Utils */
 
   ext.getURL = function(path)
   {
     return safari.extension.baseURI + path;
   };
 })();