diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 84bf3a4aec4d..986982e916a2 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -687,6 +687,7 @@ function cleanupActiveUpdate() { * the application directory. */ function getLocale() { + if (gLocale) return gLocale; @@ -694,11 +695,10 @@ function getLocale() { if (!localeFile.exists()) localeFile = FileUtils.getFile(KEY_GRED, [FILE_UPDATE_LOCALE]); - if (!localeFile.exists()) - throw Components.Exception(FILE_UPDATE_LOCALE + " file doesn't exist in " + - "either the " + KEY_APPDIR + " or " + KEY_GRED + - " directories", Cr.NS_ERROR_FILE_NOT_FOUND); - + if (!localeFile.exists()) { + // XXX temp workaround. see bug 704230 + return "en-US"; + } gLocale = readStringFromFile(localeFile); LOG("getLocale - getting locale from file: " + localeFile.path + ", locale: " + gLocale);