зеркало из https://github.com/mozilla/gecko-dev.git
Bug 489941: Rework the Update Add-ons dialog (fennec part), r=gavin
This commit is contained in:
Родитель
d327829ed2
Коммит
bf5a1b9edc
|
@ -151,6 +151,7 @@ pref("extensions.dss.switchPending", false);
|
||||||
pref("extensions.ignoreMTimeChanges", false);
|
pref("extensions.ignoreMTimeChanges", false);
|
||||||
pref("extensions.logging.enabled", false);
|
pref("extensions.logging.enabled", false);
|
||||||
pref("extensions.hideInstallButton", true);
|
pref("extensions.hideInstallButton", true);
|
||||||
|
pref("extensions.disabledAddons.showUI", true);
|
||||||
|
|
||||||
/* these point at AMO */
|
/* these point at AMO */
|
||||||
pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties");
|
pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties");
|
||||||
|
|
|
@ -55,6 +55,7 @@ const FINDSTATE_FIND_PREVIOUS = 2;
|
||||||
const endl = '\n';
|
const endl = '\n';
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/SpatialNavigation.js");
|
Cu.import("resource://gre/modules/SpatialNavigation.js");
|
||||||
|
Cu.import("resource://gre/modules/PluralForm.jsm");
|
||||||
|
|
||||||
function getBrowser() {
|
function getBrowser() {
|
||||||
return Browser.selectedBrowser;
|
return Browser.selectedBrowser;
|
||||||
|
@ -543,6 +544,20 @@ var Browser = {
|
||||||
|
|
||||||
bv.commitBatchOperation();
|
bv.commitBatchOperation();
|
||||||
|
|
||||||
|
// If some add-ons were disabled during during an application update, alert user
|
||||||
|
if (gPrefService.prefHasUserValue("extensions.disabledAddons")) {
|
||||||
|
let addons = gPrefService.getCharPref("extensions.disabledAddons").split(",");
|
||||||
|
if (addons.length > 0) {
|
||||||
|
let disabledStrings = document.getElementById("bundle_browser").getString("alertAddonsDisabled");
|
||||||
|
let label = PluralForm.get(addons.length, disabledStrings).replace("#1", addons.length);
|
||||||
|
|
||||||
|
let alerts = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
|
||||||
|
alerts.showAlertNotification(URI_GENERIC_ICON_XPINSTALL, strings.getString("alertAddons"),
|
||||||
|
label, false, "", null);
|
||||||
|
}
|
||||||
|
gPrefService.clearUserPref("extensions.disabledAddons");
|
||||||
|
}
|
||||||
|
|
||||||
//dump("end startup\n");
|
//dump("end startup\n");
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,12 @@ alertAddons=Add-ons
|
||||||
alertAddonsStart=Installing addons
|
alertAddonsStart=Installing addons
|
||||||
alertAddonsDone=Installation complete
|
alertAddonsDone=Installation complete
|
||||||
alertAddonsFail=Installation failed
|
alertAddonsFail=Installation failed
|
||||||
|
|
||||||
|
# LOCALIZATION NOTE (alertAddonsDisabled): Semi-colon list of plural forms.
|
||||||
|
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
|
||||||
|
# #1 number of add-ons
|
||||||
|
alertAddonsDisabled=#1 incompatible add-on was disabled;#1 incompatible add-ons were disabled
|
||||||
|
|
||||||
alertDownloads=Downloads
|
alertDownloads=Downloads
|
||||||
alertDownloadsStart=Downloading: %S
|
alertDownloadsStart=Downloading: %S
|
||||||
alertDownloadsDone=%S has finished downloading
|
alertDownloadsDone=%S has finished downloading
|
||||||
|
@ -83,6 +89,9 @@ geolocation.dontShare.accessKey=o
|
||||||
geolocation.siteWantsToKnow=%S wants your location.
|
geolocation.siteWantsToKnow=%S wants your location.
|
||||||
|
|
||||||
# New Tab Popup
|
# New Tab Popup
|
||||||
|
# LOCALIZATION NOTE (newtabpopup): Semi-colon list of plural forms.
|
||||||
|
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
|
||||||
|
# #1 number of tabs
|
||||||
newtabpopup.opened=New tab opened;#1 new tabs opened
|
newtabpopup.opened=New tab opened;#1 new tabs opened
|
||||||
|
|
||||||
# Error Console
|
# Error Console
|
||||||
|
|
Загрузка…
Ссылка в новой задаче