Merge pull request #7797 from adobe/bchin/fix-update-notifications-for-en-US

Fix update notification .json filename generated for 'en-US' locale

Author: ingorichter

src/utils/UpdateNotification.js

@@ -147,10 +147,16 @@ define(function (require, exports, module) {
 
         if (fetchData) {
             var lookupPromise = new $.Deferred(),
-                localVersionInfoUrl = _versionInfoUrl || _getVersionInfoUrl();
+                localVersionInfoUrl;
 
-            // If the current locale isn't en, check whether we actually have a locale-specific update notification, and fall back to en if not.
-            if (brackets.getLocale() !== "en") {
+            // If the current locale isn't "en" or "en-US", check whether we actually have a
+            //   locale-specific update notification, and fall back to "en" if not.
+            // Note: we check for both "en" and "en-US" to watch for the general case or
+            //    country-specific English locale.  The former appears default on Mac, while
+            //    the latter appears default on Windows.
+            var locale = brackets.getLocale().toLowerCase();
+            if (locale !== "en" && locale !== "en-us") {
+                localVersionInfoUrl = _versionInfoUrl || _getVersionInfoUrl();
                 $.ajax({
                     url: localVersionInfoUrl,
                     cache: false,
@@ -175,6 +181,7 @@ define(function (require, exports, module) {
                     lookupPromise.resolve();
                 });
             } else {
+                localVersionInfoUrl = _versionInfoUrl || _getVersionInfoUrl("en");
                 lookupPromise.resolve();
             }
 
@@ -321,7 +328,7 @@ define(function (require, exports, module) {
         var oldValues;
         var usingOverrides = false; // true if any of the values are overridden.
         var result = new $.Deferred();
-        var versionInfoUrl = _getVersionInfoUrl();
+        var versionInfoUrl;
 
         if (_testValues) {
             oldValues = {};