Bug 695699 - Work around to produce valid aus links. r=fabrice.
authorDoug Turner <dougt@dougt.org>
Fri, 21 Oct 2011 22:33:57 -0700
changeset 83225 f84cfff96eae8f84aec3c31f02d2a787362a2c53
parent 83224 1685afdada81ffccd2e41f1d8284404f67d08e2b
child 83226 d80bb047fca26926ac8b19e0d87eecc784526a69
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs695699
milestone10.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 695699 - Work around to produce valid aus links. r=fabrice.
toolkit/mozapps/update/nsUpdateService.js
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -574,16 +574,20 @@ function cleanupActiveUpdate() {
 
 /**
  * Gets the locale from the update.locale file for replacing %LOCALE% in the
  * update url. The update.locale file can be located in the application
  * directory or the GRE directory with preference given to it being located in
  * the application directory.
  */
 function getLocale() {
+
+  // XXX temp workaround
+  return "en-US";
+
   if (gLocale)
     return gLocale;
 
   var localeFile = FileUtils.getFile(KEY_APPDIR, [FILE_UPDATE_LOCALE]);
   if (!localeFile.exists())
     localeFile = FileUtils.getFile(KEY_GRED, [FILE_UPDATE_LOCALE]);
 
   if (!localeFile.exists())