From 9149b5ced09cc0e126f37fc8d60bf602502717f3 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Tue, 14 Nov 2023 19:08:19 -0800 Subject: [PATCH] Update hardcoded copy. --- .../BlackWhite1.colorset/Contents.json | 38 ------------------- .../BlackWhite5.colorset/Contents.json | 38 ------------------- DuckDuckGo/UserText.swift | 7 +++- DuckDuckGo/VPNWaitlistView.swift | 4 +- DuckDuckGo/VPNWaitlistViewController.swift | 4 +- DuckDuckGo/en.lproj/Localizable.strings | 11 +++++- 6 files changed, 20 insertions(+), 82 deletions(-) delete mode 100644 DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite1.colorset/Contents.json delete mode 100644 DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite5.colorset/Contents.json diff --git a/DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite1.colorset/Contents.json b/DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite1.colorset/Contents.json deleted file mode 100644 index 7a5a199e40..0000000000 --- a/DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite1.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.010", - "blue" : "0x00", - "green" : "0x00", - "red" : "0x00" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.010", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite5.colorset/Contents.json b/DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite5.colorset/Contents.json deleted file mode 100644 index ed5457638b..0000000000 --- a/DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/BlackWhite5.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.050", - "blue" : "0x00", - "green" : "0x00", - "red" : "0x00" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.050", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift index 9eff51b103..ee27064c60 100644 --- a/DuckDuckGo/UserText.swift +++ b/DuckDuckGo/UserText.swift @@ -874,7 +874,7 @@ In addition to the details entered into this form, your app issue report will co // MARK: - VPN Waitlist - static let networkProtectionWaitlistJoinTitle = NSLocalizedString("network-protection.waitlist.join.title", value: "Network Protection Beta", comment: "Title for Network Protection join waitlist screen") + static let networkProtectionWaitlistJoinTitle = NSLocalizedString("network-protection.waitlist.join.title", value: "Network Protection Early Access", comment: "Title for Network Protection join waitlist screen") static let networkProtectionWaitlistJoinSubtitle1 = NSLocalizedString("network-protection.waitlist.join.subtitle.1", value: "Secure your connection anytime, anywhere with Network Protection, the VPN from DuckDuckGo.", comment: "First subtitle for Network Protection join waitlist screen") static let networkProtectionWaitlistJoinSubtitle2 = NSLocalizedString("network-protection.waitlist.join.subtitle.2", value: "Join the waitlist, and we’ll notify you when it’s your turn.", comment: "Second subtitle for Network Protection join waitlist screen") @@ -905,4 +905,9 @@ In addition to the details entered into this form, your app issue report will co static let networkProtectionPrivacyPolicyTitle = NSLocalizedString("network-protection.privacy-policy.title", value: "Privacy Policy", comment: "Privacy Policy title for Network Protection") + static let networkProtectionWaitlistNotificationAlertDescription = NSLocalizedString("network-protection.waitlist.notification-alert.description", value: "We’ll send you a notification when your invite to test Network Protection is ready.", comment: "Body text for the alert to enable notifications") + + static let networkProtectionWaitlistGetStarted = NSLocalizedString("network-protection.waitlist.get-started", value: "Get Started", comment: "Button title text for the Network Protection waitlist confirmation prompt") + static let networkProtectionWaitlistAgreeAndContinue = NSLocalizedString("network-protection.waitlist.agree-and-continue", value: "Agree and Continue", comment: "Title text for the Network Protection terms and conditions accept button") + } diff --git a/DuckDuckGo/VPNWaitlistView.swift b/DuckDuckGo/VPNWaitlistView.swift index 194db35ab5..5f751c88fd 100644 --- a/DuckDuckGo/VPNWaitlistView.swift +++ b/DuckDuckGo/VPNWaitlistView.swift @@ -248,7 +248,7 @@ struct VPNWaitlistInvitedView: View { } .padding(.top, 24) - Button("Get Started", action: { action(.custom(.openNetworkProtectionPrivacyPolicyScreen)) }) + Button(UserText.networkProtectionWaitlistGetStarted, action: { action(.custom(.openNetworkProtectionPrivacyPolicyScreen)) }) .buttonStyle(RoundedButtonStyle(enabled: true)) .padding(.top, 32) @@ -322,7 +322,7 @@ struct VPNWaitlistPrivacyPolicyView: View { Text(VPNWaitlistUserText.networkProtectionTermsOfServiceSection8List).bodyStyle() } - Button("Agree and Continue", action: { action(.custom(.acceptNetworkProtectionTerms)) }) + Button(UserText.networkProtectionWaitlistAgreeAndContinue, action: { action(.custom(.acceptNetworkProtectionTerms)) }) .buttonStyle(RoundedButtonStyle(enabled: true)) .padding(.top, 24) } diff --git a/DuckDuckGo/VPNWaitlistViewController.swift b/DuckDuckGo/VPNWaitlistViewController.swift index 3c4871fa65..7e69cdc457 100644 --- a/DuckDuckGo/VPNWaitlistViewController.swift +++ b/DuckDuckGo/VPNWaitlistViewController.swift @@ -41,7 +41,7 @@ final class VPNWaitlistViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - title = "Network Protection Preview" + title = UserText.networkProtectionWaitlistJoinTitle addHostingControllerToViewHierarchy() @@ -96,7 +96,7 @@ extension VPNWaitlistViewController: WaitlistViewModelDelegate { func waitlistViewModelDidAskToReceiveJoinedNotification(_ viewModel: WaitlistViewModel) async -> Bool { return await withCheckedContinuation { continuation in let alertController = UIAlertController(title: UserText.waitlistNotifyMeConfirmationTitle, - message: "We’ll send you a notification when your invite to test Network Protection is ready.", + message: UserText.networkProtectionWaitlistNotificationAlertDescription, preferredStyle: .alert) alertController.overrideUserInterfaceStyle() diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings index 63c2eb1bd9..a9d6104f46 100644 --- a/DuckDuckGo/en.lproj/Localizable.strings +++ b/DuckDuckGo/en.lproj/Localizable.strings @@ -1435,6 +1435,9 @@ https://duckduckgo.com/mac"; /* Privacy Policy title for Network Protection */ "network-protection.privacy-policy.title" = "Privacy Policy"; +/* Title text for the Network Protection terms and conditions accept button */ +"network-protection.waitlist.agree-and-continue" = "Agree and Continue"; + /* Availability disclaimer for Network Protection join waitlist screen */ "network-protection.waitlist.availability-disclaimer" = "Network Protection is free to use during the beta."; @@ -1447,6 +1450,9 @@ https://duckduckgo.com/mac"; /* Join Waitlist button for Network Protection join waitlist screen */ "network-protection.waitlist.button.join-waitlist" = "Join the Waitlist"; +/* Button title text for the Network Protection waitlist confirmation prompt */ +"network-protection.waitlist.get-started" = "Get Started"; + /* Subtitle for section 1 of the Network Protection invited screen */ "network-protection.waitlist.invited.section-1.subtitle" = "Encrypt online traffic across your browsers and apps."; @@ -1478,7 +1484,7 @@ https://duckduckgo.com/mac"; "network-protection.waitlist.join.subtitle.2" = "Join the waitlist, and we’ll notify you when it’s your turn."; /* Title for Network Protection join waitlist screen */ -"network-protection.waitlist.join.title" = "Network Protection Beta"; +"network-protection.waitlist.join.title" = "Network Protection Early Access"; /* Title for Network Protection joined waitlist screen */ "network-protection.waitlist.joined.title" = "You’re on the list!"; @@ -1489,6 +1495,9 @@ https://duckduckgo.com/mac"; /* Subtitle 2 for Network Protection joined waitlist screen when notifications are enabled */ "network-protection.waitlist.joined.with-notifications.subtitle.2" = "We’ll notify you when your invite is ready."; +/* Body text for the alert to enable notifications */ +"network-protection.waitlist.notification-alert.description" = "We’ll send you a notification when your invite to test Network Protection is ready."; + /* Title for Network Protection waitlist notification */ "network-protection.waitlist.notification.text" = "Open your invite";