Bug 1408179 Fix manifestCacheKey for langpacks draft
authorAndrew Swan <aswan@mozilla.com>
Thu, 12 Oct 2017 15:27:40 -0700
changeset 679623 c1f59ae53200859a24db324746ef0922efcba189
parent 679509 98247fbf95c260786361e12ad924c4370885f686
child 735651 eb461bb3e6f0d672285c0249acf0e8567d90e2b3
push id84278
push useraswan@mozilla.com
push dateThu, 12 Oct 2017 22:27:54 +0000
bugs1408179
milestone58.0a1
Bug 1408179 Fix manifestCacheKey for langpacks MozReview-Commit-ID: Et0EyyTAi8x
toolkit/components/extensions/Extension.jsm
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -1627,16 +1627,17 @@ this.Extension = class extends Extension
     return this._optionalOrigins;
   }
 };
 
 this.Langpack = class extends ExtensionData {
   constructor(addonData, startupReason) {
     super(addonData.resourceURI);
     this.startupData = addonData.startupData;
+    this.manifestCacheKey = [addonData.id, addonData.version];
   }
 
   static getBootstrapScope(id, file) {
     return new LangpackBootstrapScope();
   }
 
   async promiseLocales(locale) {
     let locales = await StartupCache.locales
@@ -1648,20 +1649,16 @@ this.Langpack = class extends ExtensionD
   readLocaleFile(locale) {
     return StartupCache.locales.get([this.id, this.version, locale],
                                     () => super.readLocaleFile(locale))
       .then(result => {
         this.localeData.messages.set(locale, result);
       });
   }
 
-  get manifestCacheKey() {
-    return [this.id, this.version, Services.locale.getAppLocaleAsLangTag()];
-  }
-
   async _parseManifest() {
     let data = await super.parseManifest();
 
     const productCodeName = AppConstants.MOZ_BUILD_APP.replace("/", "-");
 
     // The result path looks like this:
     //   Firefox - `langpack-pl-browser`
     //   Fennec - `langpack-pl-mobile-android`