Merge pull request #14995 from jha-g/jha-g/fixing-update-notification-locale

narayani28 · web-flow · commit 437444527553 · 2020-02-12T13:56:43.000+05:30
Fixing update notification locale issue, update notification was shown in English for all locales
diff --git a/src/brackets.config.dist.json b/src/brackets.config.dist.json
@@ -3,7 +3,7 @@
     "analyticsDataServerURL"  : "https://cc-api-data.adobe.io/ingest",
     "serviceKey"              : "brackets-service",
     "environment"             : "production",
-    "update_info_url"         : "https://getupdates.brackets.io/getupdates/",
+    "update_info_url"         : "https://getupdates.brackets.io/getupdates?locale=<locale>",
     "notification_info_url"   : "https://getupdates.brackets.io/getnotifications?locale=<locale>",
     "buildtype"               : "production"
 }
diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js
@@ -115,33 +115,7 @@ define(function (require, exports, module) {
             locale = locale.substring(0, 2);
         }
 
-        //AUTOUPDATE_PRERELEASE_BEGIN
-        // The following code is needed for supporting Auto Update in prerelease,
-        //and will be removed eventually for stable releases
-        {
-            if (locale) {
-                if(locale.length > 2) {
-                    locale = locale.substring(0, 2);
-                }
-                switch(locale)  {
-                case "de":
-                    break;
-                case "es":
-                    break;
-                case "fr":
-                    break;
-                case "ja":
-                    break;
-                case "en":
-                default:
-                    locale = "en";
-                }
-                return brackets.config.update_info_url.replace("<locale>", locale);
-            }
-        }
-        //AUTOUPDATE_PRERELEASE_END
-
-        return brackets.config.update_info_url + '?locale=' + locale;
+        return brackets.config.update_info_url.replace('<locale>', locale || 'en');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"analyticsDataServerURL" : "https://cc-api-data.adobe.io/ingest",`
`4`	`4`	`"serviceKey" : "brackets-service",`
`5`	`5`	`"environment" : "production",`
`6`		`- "update_info_url" : "https://getupdates.brackets.io/getupdates/",`
	`6`	`+ "update_info_url" : "https://getupdates.brackets.io/getupdates?locale=<locale>",`
`7`	`7`	`"notification_info_url" : "https://getupdates.brackets.io/getnotifications?locale=<locale>",`
`8`	`8`	`"buildtype" : "production"`
`9`	`9`	`}`