Bug 1584518 - Remove "incompatible" message when installing corrupt or legacy add-on. r=jorgk DONTBUILD
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 30 Sep 2019 11:40:44 +1300
changeset 37023 538d73551084ef5e61ab3b27c3d3ebcd894e31e5
parent 37022 382c8c0732f066c38525cf870c474707ac820582
child 37024 0932bea10bc3d0b1e7553697acd4d13c6f4133c8
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersjorgk
bugs1584518
Bug 1584518 - Remove "incompatible" message when installing corrupt or legacy add-on. r=jorgk DONTBUILD
mail/base/modules/ExtensionsUI.jsm
mail/locales/en-US/chrome/messenger/addons.properties
--- a/mail/base/modules/ExtensionsUI.jsm
+++ b/mail/base/modules/ExtensionsUI.jsm
@@ -614,20 +614,17 @@ var gXPInstallObserver = {
 
           let error =
             host || install.error == 0
               ? "addonInstallError"
               : "addonLocalInstallError";
           let args;
 
           // Temporarily replace the usual warning message with this more-likely one.
-          if (install.error == AddonManager.ERROR_CORRUPT_FILE) {
-            error += "Legacy";
-            args = [brandShortName, Services.appinfo.version];
-          } else if (install.error != 0) {
+          if (install.error < 0) {
             error += install.error;
             args = [brandShortName, install.name];
           } else if (
             install.addon.blocklistState == Ci.nsIBlocklistService.STATE_BLOCKED
           ) {
             error += "Blocklisted";
             args = [install.name];
           } else {
--- a/mail/locales/en-US/chrome/messenger/addons.properties
+++ b/mail/locales/en-US/chrome/messenger/addons.properties
@@ -75,21 +75,19 @@ addonInstallError-3=The add-on downloade
 addonInstallError-4=%2$S could not be installed because %1$S cannot modify the needed file.
 addonInstallError-5=%1$S has prevented this site from installing an unverified add-on.
 addonLocalInstallError-1=This add-on could not be installed because of a filesystem error.
 addonLocalInstallError-2=This add-on could not be installed because it does not match the add-on %1$S expected.
 addonLocalInstallError-3=This add-on could not be installed because it appears to be corrupt.
 addonLocalInstallError-4=%2$S could not be installed because %1$S cannot modify the needed file.
 addonLocalInstallError-5=This add-on could not be installed because it has not been verified.
 
-# LOCALIZATION NOTE (addonInstallErrorIncompatible, addonInstallErrorLegacy, addonLocalInstallErrorLegacy):
+# LOCALIZATION NOTE (addonInstallErrorIncompatible):
 # %1$S is the application name, %2$S is the application version, %3$S is the add-on name
 addonInstallErrorIncompatible=%3$S could not be installed because it is not compatible with %1$S %2$S.
-addonInstallErrorLegacy=The add-on could not be installed because it is not compatible with %1$S %2$S.
-addonLocalInstallErrorLegacy=This add-on could not be installed because it is not compatible with %1$S %2$S.
 
 # LOCALIZATION NOTE (addonInstallErrorBlocklisted): %S is add-on name
 addonInstallErrorBlocklisted=%S could not be installed because it has a high risk of causing stability or security problems.
 
 # LOCALIZATION NOTE (webextPerms.header)
 # This string is used as a header in the webextension permissions dialog,
 # %S is replaced with the localized name of the extension being installed.
 # See https://bug1308309.bmoattachments.org/attachment.cgi?id=8814612