corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1955521 - Safebrowsing: avoid generating Fluent IDs at run-time, clean up FTL file, r=dimi

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D242488
This commit is contained in:
Francesco Lodolo (:flod)
2025-03-21 09:40:55 +00:00
parent 0c67604806
commit 5a59b92711
2 changed files with 51 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
browser/base/content/blockedSite.js
View File

@@ -67,86 +67,84 @@ function onClickSeeDetails() {
}
function initPage() {
var error = "";
switch (getErrorCode()) {
case "malwareBlocked":
error = "malware";
break;
case "deceptiveBlocked":
error = "phishing";
break;
case "unwantedBlocked":
error = "unwanted";
break;
case "harmfulBlocked":
error = "harmful";
break;
default:
return;
const errorMap = {
malwareBlocked: "malware",
deceptiveBlocked: "phishing",
unwantedBlocked: "unwanted",
harmfulBlocked: "harmful",
};
const error = errorMap[getErrorCode()];
if (error === undefined) {
return;
}
const messageIDs = {
malware: {
title: "safeb-blocked-malware-page-title",
shortDesc: "safeb-blocked-malware-page-short-desc",
innerDescOverride: "safeb-blocked-malware-page-error-desc-override-sumo",
innerDescNoOverride:
"safeb-blocked-malware-page-error-desc-no-override-sumo",
learnMore: "safeb-blocked-malware-page-learn-more-sumo",
},
phishing: {
title: "safeb-blocked-phishing-page-title",
shortDesc: "safeb-blocked-phishing-page-short-desc",
innerDescOverride: "safeb-blocked-phishing-page-error-desc-override",
innerDescNoOverride: "safeb-blocked-phishing-page-error-desc-no-override",
learnMore: "safeb-blocked-phishing-page-learn-more",
},
unwanted: {
title: "safeb-blocked-unwanted-page-title",
shortDesc: "safeb-blocked-unwanted-page-short-desc",
innerDescOverride: "safeb-blocked-unwanted-page-error-desc-override",
innerDescNoOverride: "safeb-blocked-unwanted-page-error-desc-no-override",
learnMore: "safeb-blocked-unwanted-page-learn-more",
},
harmful: {
title: "safeb-blocked-harmful-page-title",
shortDesc: "safeb-blocked-harmful-page-short-desc",
innerDescOverride: "safeb-blocked-harmful-page-error-desc-override",
innerDescNoOverride: "safeb-blocked-harmful-page-error-desc-no-override",
learnMore: "safeb-blocked-harmful-page-learn-more",
},
};
// Set page contents depending on type of blocked page
// Prepare the title and short description text
let titleText = document.getElementById("errorTitleText");
document.l10n.setAttributes(
titleText,
"safeb-blocked-" + error + "-page-title"
);
document.l10n.setAttributes(titleText, messageIDs[error].title);
let shortDesc = document.getElementById("errorShortDescText");
document.l10n.setAttributes(
shortDesc,
"safeb-blocked-" + error + "-page-short-desc"
);
document.l10n.setAttributes(shortDesc, messageIDs[error].shortDesc);
// Prepare the inner description, ensuring any redundant inner elements are removed.
let innerDesc = document.getElementById("errorInnerDescription");
let innerDescL10nID = "safeb-blocked-" + error + "-page-error-desc-";
let innerDescL10nID;
if (!getOverride()) {
innerDescL10nID += "no-override";
innerDescL10nID = messageIDs[error].innerDescNoOverride;
document.getElementById("ignore_warning_link").remove();
} else {
innerDescL10nID += "override";
innerDescL10nID = messageIDs[error].innerDescOverride;
}
if (error == "unwanted" || error == "harmful") {
document.getElementById("report_detection").remove();
}
// Add the inner description:
// Map specific elements to a different message ID, to allow updates to
// existing labels
let descriptionMapping = {
malware: innerDescL10nID + "-sumo",
};
document.l10n.setAttributes(
innerDesc,
descriptionMapping[error] || innerDescL10nID,
{
sitename: getHostString(),
}
);
document.l10n.setAttributes(innerDesc, innerDescL10nID, {
sitename: getHostString(),
});
// Add the learn more content:
// Map specific elements to a different message ID, to allow updates to
// existing labels
let stringMapping = {
malware: "safeb-blocked-malware-page-learn-more-sumo",
};
let learnMore = document.getElementById("learn_more");
document.l10n.setAttributes(
learnMore,
stringMapping[error] || `safeb-blocked-${error}-page-learn-more`
);
document.l10n.setAttributes(learnMore, messageIDs[error].learnMore);
// Set sitename to bold by adding class
let errorSitename = document.getElementById("error_desc_sitename");
errorSitename.setAttribute("class", "sitename");
let titleEl = document.createElement("title");
document.l10n.setAttributes(
titleEl,
"safeb-blocked-" + error + "-page-title"
);
document.l10n.setAttributes(titleEl, messageIDs[error].title);
document.head.appendChild(titleEl);
// Inform the test harness that we're done loading the page.

24
browser/locales/en-US/browser/safebrowsing/blockedSite.ftl
View File

@@ -21,40 +21,16 @@ safeb-palm-see-details-label = See details
safeb-blocked-phishing-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as a deceptive site</a>. You can <a data-l10n-name='report_detection'>report a detection problem</a> or <a data-l10n-name='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.
safeb-blocked-phishing-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as a deceptive site</a>. You can <a data-l10n-name='report_detection'>report a detection problem</a>.
##
safeb-blocked-phishing-page-learn-more = Learn more about deceptive sites and phishing at <a data-l10n-name='learn_more_link'>www.antiphishing.org</a>. Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
## Variables
## $sitename (string) - Domain name for the blocked page
safeb-blocked-malware-page-error-desc-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing malicious software</a>. You can <a data-l10n-name='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.
safeb-blocked-malware-page-error-desc-no-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing malicious software</a>.
##
safeb-blocked-malware-page-learn-more-sumo = Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
## Variables
## $sitename (string) - Domain name for the blocked page
safeb-blocked-unwanted-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing harmful software</a>. You can <a data-l10n-name='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.
safeb-blocked-unwanted-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing harmful software</a>.
##
safeb-blocked-unwanted-page-learn-more = Learn more about harmful and unwanted software at <a data-l10n-name='learn_more_link'>Unwanted Software Policy</a>. Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
## Variables
## $sitename (string) - Domain name for the blocked page
safeb-blocked-harmful-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing a potentially harmful application</a>. You can <a data-l10n-name='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.
safeb-blocked-harmful-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing a potentially harmful application</a>.
##
safeb-blocked-harmful-page-learn-more = Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
safeb-palm-notdeceptive =
.label = This isn’t a deceptive site…
.accesskey = d