Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Malware protection localization #3673

Merged
merged 9 commits into from
Dec 20, 2024
Merged

Malware protection localization #3673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd07d0f
Update pixels
mallexxx Dec 18, 2024
31a8094
bump bsk
mallexxx Dec 18, 2024
f69e608
bump bsk
mallexxx Dec 18, 2024
b9fd69c
Localizable.xcstrings
mallexxx Dec 18, 2024
442718d
Add localizations
mallexxx Dec 18, 2024
9c171b1
Bump deps
mallexxx Dec 18, 2024
ce9fa03
BSK -> 223.0.0
mallexxx Dec 20, 2024
57e13df
Merge remote-tracking branch 'origin/main' into alex/malware-protecti…
mallexxx Dec 20, 2024
fb94523
Merge branch 'alex/malware-protection-pixels' into alex/malware-prote…
mallexxx Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15306,7 +15306,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 222.1.0;
version = 223.0.0;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
12 changes: 6 additions & 6 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "5704d77e3b4c77c7387518d796d31a35f7a1ffcf",
"version" : "222.1.0"
"revision" : "e8f94cf597f4a447f86f39f461b736ac9ea280ce",
"version" : "223.0.0"
}
},
{
"identity" : "content-scope-scripts",
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/content-scope-scripts",
"state" : {
"revision" : "93ea6c3e771bc0b743b38cefbff548c10add9898",
"version" : "6.42.0"
"revision" : "bc808eb735d9eb72d5c54cf2452b104b6a370e25",
"version" : "6.43.0"
}
},
{
Expand Down Expand Up @@ -104,8 +104,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/privacy-dashboard",
"state" : {
"revision" : "022c845b06ace6a4aa712a4fa3e79da32193d5c6",
"version" : "7.4.0"
"revision" : "2e2baf7d31c7d8e158a58bc1cb79498c1c727fd2",
"version" : "7.5.0"
}
},
{
Expand Down
296 changes: 1 addition & 295 deletions DuckDuckGo/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10577,66 +10577,6 @@
}
}
},
"bookmarks.bar.prompt.message" : {
"comment" : "Message show for bookmarks bar prompt",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Zeige die Lesezeichenleiste an, um schnell auf deine neuen Lesezeichen zugreifen zu können."
}
},
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Show the Bookmarks Bar for quick access to your new bookmarks."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Muestra la barra de marcadores para acceder rápidamente a tus nuevos marcadores."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Affichez la barre des signets pour accéder rapidement à vos nouveaux signets."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Mostra la barra dei segnalibri per accedere rapidamente ai nuovi segnalibri."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Laat de bladwijzerbalk zien voor snelle toegang tot je nieuwe bladwijzers."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pokaż pasek zakładek, aby mieć szybki dostęp do nowych zakładek."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"value" : "Mostra a barra de marcadores para teres acesso rápido aos teus novos marcadores."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Показывает панель для быстрого доступа к новым закладкам."
}
}
}
},
"bookmarks.bar.prompt.message1" : {
"comment" : " message show for bookmarks bar prompt\n message with markdown show for bookmarks bar prompt, make sure to keep the ** ** for the translated words Settings and Appearance",
"extractionState" : "extracted_with_value",
Expand Down Expand Up @@ -16122,126 +16062,6 @@
}
}
},
"contextual.onboarding.try-search.surprise-me-english" : {
"comment" : "Browser Search query for chocolate chip cookie recipes",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Rezepte für Schokoladenkekse"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "chocolate chip cookie recipes"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "recetas de galletas con pepitas de chocolate"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "recettes de cookies aux pépites de chocolat"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "ricette di biscotti con gocce di cioccolato"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Recepten voor chocoladekoekjes"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "przepisy na ciastka z kawałkami czekolady"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"value" : "receitas de biscoitos de chocolate"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "рецепты печенья с шоколадной крошкой"
}
}
}
},
"contextual.onboarding.try-search.surprise-me-international" : {
"comment" : "Browser Search query for dinner recipes",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Dinner-Rezepte"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "dinner recipes"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "recetas para la cena"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "recettes pour le dîner"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "ricette per la cena"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "recepten voor het avondeten"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "przepisy na obiad"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"value" : "receitas de jantar"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "рецепты на ужин"
}
}
}
},
"contextual.onboarding.try-search.surprise-me-title" : {
"comment" : "Title for a button that triggers an unknown search query for the user.",
"extractionState" : "extracted_with_value",
Expand Down Expand Up @@ -56018,66 +55838,6 @@
}
}
},
"preferences.about.privacy-simplified" : {
"comment" : "About screen",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Datenschutz leicht gemacht."
}
},
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Privacy, simplified."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Privacidad, simplificada."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "La confidentialité, simplifiée."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "La privacy, semplificata."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Privacy, vereenvoudigd."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Prywatność — jeszcze prostsza."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"value" : "Privacidade, simplificada."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Максимум конфиденциальности, минимум усилий."
}
}
}
},
"preferences.about.send-feedback" : {
"comment" : "Feedback button in the about preferences page",
"extractionState" : "extracted_with_value",
Expand Down Expand Up @@ -60841,60 +60601,6 @@
}
}
},
"Select Data to Import:" : {
"comment" : "Data Import section title for checkboxes of data type to import: Passwords or Bookmarks.",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Zu importierende Daten auswählen:"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Selecciona los datos a importar:"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sélectionner les données à importer :"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Seleziona i dati da importare:"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Selecteer gegevens om te importeren:"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Wybierz dane do zaimportowania:"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"value" : "Selecionar dados para importar:"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Выберите данные для импорта:"
}
}
}
},
"Select Profile:" : {
"comment" : "Browser Profile picker title for Data Import",
"localizations" : {
Expand Down Expand Up @@ -72538,4 +72244,4 @@
}
},
"version" : "1.0"
}
}
4 changes: 2 additions & 2 deletions DuckDuckGo/Tab/TabExtensions/SpecialErrorPageTabExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ extension SpecialErrorPageTabExtension: NavigationResponder {

@MainActor
private func redirectMaliciousIframeNavigationAction(_ navigationAction: NavigationAction, with threatKind: MaliciousSiteProtection.ThreatKind) -> NavigationActionPolicy? {
PixelKit.fire(MaliciousSiteProtection.Event.iframeLoaded)
PixelKit.fire(MaliciousSiteProtection.Event.iframeLoaded(category: threatKind))

// Extract the URL of the source frame (the iframe) that initiated the navigation action
let iframeTopUrl = navigationAction.sourceFrame.url
Expand Down Expand Up @@ -232,7 +232,7 @@ extension SpecialErrorPageTabExtension: SpecialErrorPageUserScriptDelegate {
guard let errorData, let webView, let url = webView.url else { return }
switch errorData {
case .maliciousSite(kind: let threatKind, url: _):
PixelKit.fire(MaliciousSiteProtection.Event.visitSite)
PixelKit.fire(MaliciousSiteProtection.Event.visitSite(category: threatKind))

exemptions[url] = threatKind
state.bypassedMaliciousSiteThreatKind = threatKind
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DataBrokerProtection/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let package = Package(
targets: ["DataBrokerProtection"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../AppKitExtensions"),
.package(path: "../XPCHelper"),
Expand Down
Loading
Loading