Skip to content

Commit

Permalink
Revert "Use NotLocalizedString on DBP error screen copy" (#2731)
Browse files Browse the repository at this point in the history 
Task/Issue URL:
https://app.asana.com/0/1204167627774280/1207212073888336/f
Tech Design URL:
CC:

**Description**:
This reverts commit e2d1428.
  • Loading branch information
@Bunn
Bunn authored May 1, 2024
1 parent e2d1428 commit 71e3c0c
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 96 deletions.
10 changes: 0 additions & 10 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@
31A2FD172BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */; };
31A2FD182BAB43BA00D0E741 /* DataBrokerProtectionVisibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */; };
31A3A4E32B0C115F0021063C /* DataBrokerProtection in Frameworks */ = {isa = PBXBuildFile; productRef = 31A3A4E22B0C115F0021063C /* DataBrokerProtection */; };
31A83FB52BE28D7D00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
31A83FB62BE28D7D00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
31A83FB72BE28D8A00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
31A83FB82BE28D8A00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
31AA6B972B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
31AA6B982B960BA50025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
31B4AF532901A4F20013585E /* NSEventExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31B4AF522901A4F20013585E /* NSEventExtension.swift */; };
Expand Down Expand Up @@ -2854,7 +2850,6 @@
3199C6F82AF94F5B002A7BA1 /* DataBrokerProtectionFeatureDisabler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionFeatureDisabler.swift; sourceTree = "<group>"; };
3199C6FC2AF97367002A7BA1 /* DataBrokerProtectionAppEvents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionAppEvents.swift; sourceTree = "<group>"; };
31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionVisibilityTests.swift; sourceTree = "<group>"; };
31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserText+DBP.swift"; sourceTree = "<group>"; };
31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionLoginItemPixels.swift; sourceTree = "<group>"; };
31B4AF522901A4F20013585E /* NSEventExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSEventExtension.swift; sourceTree = "<group>"; };
31C3CE0128EDC1E70002C24A /* CustomRoundedCornersShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomRoundedCornersShape.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6803,7 +6798,6 @@
children = (
AA80EC53256BE3BC007083E7 /* UserText.swift */,
4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */,
31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */,
);
path = Localizables;
sourceTree = "<group>";
Expand Down Expand Up @@ -9987,7 +9981,6 @@
3706FC2F293F65D500E42796 /* MouseOverButton.swift in Sources */,
3706FC30293F65D500E42796 /* FireInfoViewController.swift in Sources */,
B6F1B02F2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */,
31A83FB62BE28D7D00F74E67 /* UserText+DBP.swift in Sources */,
56BA1E832BAC506F001CF69F /* SSLErrorPageUserScript.swift in Sources */,
3706FC31293F65D500E42796 /* PermissionButton.swift in Sources */,
3706FC32293F65D500E42796 /* MoreOptionsMenu.swift in Sources */,
Expand Down Expand Up @@ -10689,7 +10682,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
31A83FB72BE28D8A00F74E67 /* UserText+DBP.swift in Sources */,
9D9AE92C2AAB84FF0026E7DC /* DBPMocks.swift in Sources */,
7B0099792B65013800FE7C31 /* BrowserWindowManager.swift in Sources */,
9D9AE9292AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift in Sources */,
Expand All @@ -10703,7 +10695,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
31A83FB82BE28D8A00F74E67 /* UserText+DBP.swift in Sources */,
7B1459542B7D437200047F2C /* BrowserWindowManager.swift in Sources */,
9D9AE92D2AAB84FF0026E7DC /* DBPMocks.swift in Sources */,
9D9AE92A2AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift in Sources */,
Expand Down Expand Up @@ -11466,7 +11457,6 @@
B634DBDF293C8F7F00C3C99E /* Tab+UIDelegate.swift in Sources */,
B6F1B02E2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */,
37AFCE8127DA2CA600471A10 /* PreferencesViewController.swift in Sources */,
31A83FB52BE28D7D00F74E67 /* UserText+DBP.swift in Sources */,
4B02198A25E05FAC00ED7DEA /* FireproofDomains.swift in Sources */,
4B677442255DBEEA00025BD8 /* Database.swift in Sources */,
1DDC85032B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */,
Expand Down
86 changes: 0 additions & 86 deletions DuckDuckGo/Common/Localizables/UserText+DBP.swift
View file

This file was deleted.

54 changes: 54 additions & 0 deletions DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,60 @@ extension UserText {
}
}

#if DBP
// MARK: - Data Broker Protection Waitlist
extension UserText {
// "data-broker-protection.privacy-policy.title" - Privacy Policy title for Personal Information Removal
static let dataBrokerProtectionPrivacyPolicyTitle = "Privacy Policy"
// "data-broker-protection.waitlist.notification.title" - Title for Personal Information Removal waitlist notification
static let dataBrokerProtectionWaitlistNotificationTitle = "Personal Information Removal beta is ready!"
// "data-broker-protection.waitlist.notification.text" - Title for Personal Information Removal waitlist notification
static let dataBrokerProtectionWaitlistNotificationText = "Open your invite"
// "data-broker-protection.waitlist.join.title" - Title for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistJoinTitle = "Personal Information Removal Beta"
// "data-broker-protection.waitlist.join.subtitle.1" - First subtitle for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistJoinSubtitle1 = "Automatically scan and remove your data from 17+ sites that sell personal information with DuckDuckGo’s Personal Information Removal."
// "data-broker-protection.waitlist.joined.title" - Title for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistJoinedTitle = "You’re on the list!"
// "data-broker-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for Personal Information Removal joined waitlist screen when notifications are enabled
static let dataBrokerProtectionWaitlistJoinedWithNotificationsSubtitle1 = "New invites are sent every few days, on a first come, first served basis."
// "data-broker-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for Personal Information Removal joined waitlist screen when notifications are enabled
static let dataBrokerProtectionWaitlistJoinedWithNotificationsSubtitle2 = "We’ll notify you when your invite is ready."
// "data-broker-protection.waitlist.enable-notifications" - Enable notifications prompt for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistEnableNotifications = "Want to get a notification when your Personal Information Removal invite is ready?"
// "data-broker-protection.waitlist.invited.title" - Title for Personal Information Removal invited screen
static let dataBrokerProtectionWaitlistInvitedTitle = "You’re invited to try\nPersonal Information Removal beta!"
// "data-broker-protection.waitlist.invited.subtitle" - Subtitle for Personal Information Removal invited screen
static let dataBrokerProtectionWaitlistInvitedSubtitle = "Automatically find and remove your personal information – such as your name and address – from 17+ sites that store and sell it, reducing the risk of identity theft and spam."
// "data-broker-protection.waitlist.enable.title" - Title for Personal Information Removal enable screen
static let dataBrokerProtectionWaitlistEnableTitle = "Let’s get started"
// "data-broker-protection.waitlist.enable.subtitle" - Subtitle for Personal Information Removal enable screen
static let dataBrokerProtectionWaitlistEnableSubtitle = "We’ll need your name, address and the year you were born in order to find your personal information on data broker sites\n\nThis info is stored securely on your device, and is never sent to DuckDuckGo."
// "data-broker-protection.waitlist.availability-disclaimer" - Availability disclaimer for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistAvailabilityDisclaimer = "Personal Information Removal is free during the beta.\nJoin the waitlist and we'll notify you when ready."
// "data-broker-protection.waitlist.button.close" - Close button for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistButtonClose = "Close"
// "data-broker-protection.waitlist.button.done" - Close button for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistButtonDone = "Done"
// "data-broker-protection.waitlist.button.dismiss" - Dismiss button for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistButtonDismiss = "Dismiss"
// "data-broker-protection.waitlist.button.cancel" - Cancel button for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistButtonCancel = "Cancel"
// "data-broker-protection.waitlist.button.no-thanks" - No Thanks button for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistButtonNoThanks = "No Thanks"
// "data-broker-protection.waitlist.button.get-started" - Get Started button for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistButtonGetStarted = "Get Started"
// "data-broker-protection.waitlist.button.got-it" - Get started button for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistButtonGotIt = "Get started"
// "data-broker-protection.waitlist.button.enable-notifications" - Enable Notifications button for Personal Information Removal joined waitlist screen
static let dataBrokerProtectionWaitlistButtonEnableNotifications = "Enable Notifications"
// "data-broker-protection.waitlist.button.join-waitlist" - Join Waitlist button for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistButtonJoinWaitlist = "Join the Waitlist"
// "data-broker-protection.waitlist.button.agree-and-continue" - Agree and Continue button for Personal Information Removal join waitlist screen
static let dataBrokerProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
}
#endif

// MARK: - Thank You Modals

extension UserText {
Expand Down
Loading

0 comments on commit 71e3c0c

Please sign in to comment.