Skip to content

Commit 7a37fdc

Browse files
mgurgelgithub-actions[bot]
authored andcommitted
Release build 7.16.0 [ci release]
1 parent 4a6bca2 commit 7a37fdc

File tree

90 files changed

+1459
-680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1459
-680
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- ntp: final italian translations (#1462)
1+
- Malicious site protection - iOS Ship review feedback (#1443)
Lines changed: 15 additions & 0 deletions
Loading

Sources/ContentScopeScripts/dist/pages/special-error/dist/index.css

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@ body:not([data-platform-name]) .Button_button:active {
556556
}
557557
[data-platform-name=ios] .Warning_content {
558558
text-align: center;
559+
white-space: pre-line;
559560
}
560561
[data-platform-name=ios] .Warning_buttonContainer {
561562
flex-flow: column-reverse;
@@ -580,11 +581,21 @@ body:not([data-platform-name]) .Button_button:active {
580581
background-image: url("./Shield-Alert-128-NGB6TVH6.svg");
581582
}
582583
[data-platform-name=ios] :is(.Warning_phishing .Warning_icon, .Warning_malware .Warning_icon) {
583-
background-image: url("./Malware-Site-96-A35AQOKY.svg");
584+
background-image: url("./Malware-Site-128-YUDZDGMR.svg");
585+
}
586+
[data-platform-name=ios] .Warning_title {
587+
white-space: pre-line;
584588
}
585-
[data-platform-name=ios] [data-line-break]::before {
586-
content: " ";
587-
display: block;
589+
@media (min-width: 600px) {
590+
[data-platform-name=ios] .Warning_title {
591+
white-space: normal;
592+
}
593+
}
594+
@supports (text-wrap: balance) {
595+
[data-platform-name=ios] .Warning_title {
596+
text-wrap: balance;
597+
white-space: normal;
598+
}
588599
}
589600

590601
/* pages/special-error/app/components/Components.module.css */

Sources/ContentScopeScripts/dist/pages/special-error/dist/index.js

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,24 +1840,32 @@
18401840
note: "Button shown in an error page that warns users of security risks on a website due to Phishing or Malware issues. The buttons allows the user to visit the website anyway despite the risks."
18411841
},
18421842
malwarePageHeading: {
1843-
title: "Warning: This site may put your personal information at risk",
1844-
note: "Title shown in an error page that warn users of security risks on a website due to malware distribution"
1843+
title: "Warning: This site may be a{newline}security risk",
1844+
note: "Title shown in an error page that warn users of security risks on a website due to malware distribution. The {newline} tag should not be translated. It should be placed within the sentence to avoid having a single word hanging on the last line"
1845+
},
1846+
malwareTabTitle: {
1847+
title: "Warning: Security Risk",
1848+
note: "Title shown in the browser window or tab when the current page may be a security risk due to malware"
18451849
},
18461850
malwareWarningText: {
1847-
title: "DuckDuckGo blocked this page because it may be distributing malware designed to compromise your device or steal your personal information. <a>Learn more</a>",
1848-
note: "Error description shown in an error page that warns users of security risks on a website due to malware distribution."
1851+
title: "DuckDuckGo blocked this page because it may be distributing malware designed to compromise your device or steal your personal information.{newline}<a>Learn more</a>",
1852+
note: "Error description shown in an error page that warns users of security risks on a website due to malware distribution. The {newline} tag should not be translated. It should be placed before the translated <a>Learn More</a> text."
18491853
},
18501854
malwareAdvancedInfoHeading: {
18511855
title: "If you believe this website is safe, you can <a>report an error</a>. You can still visit the website at your own risk.",
18521856
note: "Title of the Advanced info section shown in an error page that warns users of security risks on a website due to malware distribution."
18531857
},
18541858
phishingPageHeading: {
1855-
title: "Warning: This site may put your personal information at risk",
1856-
note: "Title shown in an error page that warn users of security risks on a website due to Phishing issues"
1859+
title: "Warning: This site may be a{newline}security risk",
1860+
note: "Title shown in an error page that warn users of security risks on a website due to Phishing issues. The {newline} tag should not be translated. It should be placed within the sentence to avoid having a single word hanging on the last line"
1861+
},
1862+
phishingTabTitle: {
1863+
title: "Warning: Security Risk",
1864+
note: "Title shown in the browser window or tab when the current page may be a security risk due to phishing"
18571865
},
18581866
phishingWarningText: {
1859-
title: "This website may be impersonating a legitimate site in order to trick you into providing personal information, such as passwords or credit card numbers. <a>Learn more</a>",
1860-
note: "Error description shown in an error page that warns users of security risks on a website due to Phishing issues."
1867+
title: "This website may be impersonating a legitimate site in order to trick you into providing personal information, such as passwords or credit card numbers.{newline}<a>Learn more</a>",
1868+
note: "Error description shown in an error page that warns users of security risks on a website due to Phishing issues. The {newline} tag should not be translated. It should be placed before the translated <a>Learn More</a> text."
18611869
},
18621870
phishingAdvancedInfoHeading: {
18631871
title: "If you believe this website is safe, you can <a>report an error</a>. You can still visit the website at your own risk.",
@@ -1939,7 +1947,6 @@
19391947
}
19401948
};
19411949
var helpPageAnchorTagParams = {
1942-
"data-line-break": true,
19431950
href: phishingMalwareHelpPageURL,
19441951
target: "_blank"
19451952
};
@@ -1956,10 +1963,10 @@
19561963
const { t: t3 } = useTypedTranslation();
19571964
const { kind } = useErrorData();
19581965
if (kind === "phishing") {
1959-
return t3("phishingPageHeading");
1966+
return t3("phishingPageHeading").replace("{newline}", "\n");
19601967
}
19611968
if (kind === "malware") {
1962-
return t3("malwarePageHeading");
1969+
return t3("malwarePageHeading").replace("{newline}", "\n");
19631970
}
19641971
if (kind === "ssl") {
19651972
return t3("sslPageHeading");
@@ -1971,10 +1978,12 @@
19711978
const errorData = useErrorData();
19721979
const { kind } = useErrorData();
19731980
if (kind === "phishing") {
1974-
return [/* @__PURE__ */ g(Trans, { str: t3("phishingWarningText"), values: { a: helpPageAnchorTagParams } })];
1981+
const text = t3("phishingWarningText").replace("{newline}", "\n");
1982+
return [/* @__PURE__ */ g(Trans, { str: text, values: { a: helpPageAnchorTagParams } })];
19751983
}
19761984
if (kind === "malware") {
1977-
return [/* @__PURE__ */ g(Trans, { str: t3("malwareWarningText"), values: { a: helpPageAnchorTagParams } })];
1985+
const text = t3("malwareWarningText").replace("{newline}", "\n");
1986+
return [/* @__PURE__ */ g(Trans, { str: text, values: { a: helpPageAnchorTagParams } })];
19781987
}
19791988
if (kind === "ssl") {
19801989
const { domain } = (
@@ -2169,7 +2178,8 @@
21692178
phishing: "Warning_phishing",
21702179
malware: "Warning_malware",
21712180
button: "Warning_button",
2172-
advanced: "Warning_advanced"
2181+
advanced: "Warning_advanced",
2182+
title: "Warning_title"
21732183
};
21742184

21752185
// pages/special-error/app/components/Warning.jsx
@@ -2204,7 +2214,16 @@
22042214
const { kind } = useErrorData();
22052215
const heading = useWarningHeading();
22062216
const platformName = usePlatformName();
2207-
return /* @__PURE__ */ g("header", { className: (0, import_classnames3.default)(Warning_default.heading, Warning_default[kind]) }, /* @__PURE__ */ g("i", { className: Warning_default.icon, "aria-hidden": "true" }), /* @__PURE__ */ g(Text, { as: "h1", variant: platformName === "macos" ? "title-2-emphasis" : "title-2", strictSpacing: platformName !== "macos" }, heading));
2217+
return /* @__PURE__ */ g("header", { className: (0, import_classnames3.default)(Warning_default.heading, Warning_default[kind]) }, /* @__PURE__ */ g("i", { className: Warning_default.icon, "aria-hidden": "true" }), /* @__PURE__ */ g(
2218+
Text,
2219+
{
2220+
as: "h1",
2221+
variant: platformName === "macos" ? "title-2-emphasis" : "title-2",
2222+
strictSpacing: platformName !== "macos",
2223+
className: Warning_default.title
2224+
},
2225+
heading
2226+
));
22082227
}
22092228
function WarningContent() {
22102229
const content = useWarningContent();
@@ -2230,10 +2249,10 @@
22302249
y2(() => {
22312250
switch (kind) {
22322251
case "malware":
2233-
document.title = t3("malwarePageHeading");
2252+
document.title = t3("malwareTabTitle");
22342253
break;
22352254
case "phishing":
2236-
document.title = t3("phishingPageHeading");
2255+
document.title = t3("phishingTabTitle");
22372256
break;
22382257
default:
22392258
document.title = t3("sslPageHeading");

0 commit comments

Comments
 (0)