зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1391421 - Part 7 - Switch addon/theme install prompts to Unicode domains. r=jwu
MozReview-Commit-ID: HlQKTJRu0FT --HG-- extra : rebase_source : 80cda7b048e6b45cba4867538cc00ad6b83db4e7
This commit is contained in:
Родитель
3d412565c0
Коммит
18b4ca79db
|
@ -3200,7 +3200,9 @@ var LightWeightThemeWebInstaller = {
|
||||||
}
|
}
|
||||||
|
|
||||||
let allowButtonText = Strings.browser.GetStringFromName("lwthemeInstallRequest.allowButton");
|
let allowButtonText = Strings.browser.GetStringFromName("lwthemeInstallRequest.allowButton");
|
||||||
let message = Strings.browser.formatStringFromName("lwthemeInstallRequest.message", [node.ownerDocument.location.hostname], 1);
|
let IDNService = Cc["@mozilla.org/network/idn-service;1"].getService(Ci.nsIIDNService);
|
||||||
|
let hostname = IDNService.convertToDisplayIDN(node.ownerDocument.location.hostname);
|
||||||
|
let message = Strings.browser.formatStringFromName("lwthemeInstallRequest.message", [hostname], 1);
|
||||||
let buttons = [{
|
let buttons = [{
|
||||||
label: allowButtonText,
|
label: allowButtonText,
|
||||||
callback: function () {
|
callback: function () {
|
||||||
|
@ -4912,7 +4914,7 @@ var XPInstallObserver = {
|
||||||
installInfo = aSubject.wrappedJSObject;
|
installInfo = aSubject.wrappedJSObject;
|
||||||
tab = BrowserApp.getTabForBrowser(installInfo.browser);
|
tab = BrowserApp.getTabForBrowser(installInfo.browser);
|
||||||
if (installInfo.originatingURI) {
|
if (installInfo.originatingURI) {
|
||||||
host = installInfo.originatingURI.host;
|
host = installInfo.originatingURI.displayHost;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5095,9 +5097,9 @@ var XPInstallObserver = {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let host = (aInstall.originatingURI instanceof Ci.nsIStandardURL) && aInstall.originatingURI.host;
|
let host = (aInstall.originatingURI instanceof Ci.nsIStandardURL) && aInstall.originatingURI.displayHost;
|
||||||
if (!host) {
|
if (!host) {
|
||||||
host = (aInstall.sourceURI instanceof Ci.nsIStandardURL) && aInstall.sourceURI.host;
|
host = (aInstall.sourceURI instanceof Ci.nsIStandardURL) && aInstall.sourceURI.displayHost;
|
||||||
}
|
}
|
||||||
|
|
||||||
let error = (host || aInstall.error == 0) ? "addonError" : "addonLocalError";
|
let error = (host || aInstall.error == 0) ? "addonError" : "addonLocalError";
|
||||||
|
|
Загрузка…
Ссылка в новой задаче