Bug 1497842 - Remove INSTALL_LOCALE from APP_CONSTANTS r=Standard8
authormonmanuela <manuela.monika97@gmail.com>
Tue, 26 Mar 2019 13:03:56 +0000
changeset 524913 9f7a419466c3f4f13d426ba5c2cfb563e5e0bc03
parent 524893 58fe84489519e891e049ad1eccee5f7ad046c1ba
child 524914 6a07933fe4cb31d221e2d0921996da27c1576567
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs1497842
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1497842 - Remove INSTALL_LOCALE from APP_CONSTANTS r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D24662
toolkit/modules/AppConstants.jsm
toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -307,17 +307,16 @@ this.AppConstants = Object.freeze({
   DLL_SUFFIX: "@DLL_SUFFIX@",
 
   MOZ_APP_NAME: "@MOZ_APP_NAME@",
   MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
   MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@",
   MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
   MOZ_MACBUNDLE_NAME: "@MOZ_MACBUNDLE_NAME@",
   MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
-  INSTALL_LOCALE: "@AB_CD@",
   MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
   ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",
 
   DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
 
   MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",
   MOZ_BING_API_KEY: "@MOZ_BING_API_KEY@",
   MOZ_GOOGLE_LOCATION_SERVICE_API_KEY: "@MOZ_GOOGLE_LOCATION_SERVICE_API_KEY@",
--- a/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
+++ b/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
@@ -219,18 +219,18 @@ add_task(async function test_build_targe
 // Bug 488936 added the update.locale file that stores the update locale
 add_task(async function test_locale() {
   // The code that gets the locale accesses the profile which is only available
   // after calling do_get_profile in xpcshell tests. This prevents an error from
   // being logged.
   do_get_profile();
 
   let url = URL_PREFIX + "%LOCALE%/";
-  Assert.equal(await getResult(url), AppConstants.INSTALL_LOCALE,
-               "the url param for %LOCALE%" + MSG_SHOULD_EQUAL);
+  Assert.equal(await getResult(url), "en-US",
+               "Assuming we are built with en-US, the url param for %LOCALE%" + MSG_SHOULD_EQUAL);
 });
 
 // url constructed with %CHANNEL%
 add_task(async function test_channel() {
   let url = URL_PREFIX + "%CHANNEL%/";
   setUpdateChannel("test_channel");
   Assert.equal(await getResult(url), "test_channel",
                "the url param for %CHANNEL%" + MSG_SHOULD_EQUAL);