Skip to content

Commit

Permalink
Update the edit email labels
Browse files Browse the repository at this point in the history
  • Loading branch information
miasma13 committed Jun 28, 2024
1 parent a98ed57 commit 73cf88e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ final class SubscriptionEmailViewModel: ObservableObject {
let addEmailToSubscriptionURL = subscriptionManager.url(for: .addEmail)
let manageSubscriptionEmailURL = subscriptionManager.url(for: .manageEmail)
emailURL = accountManager.email == nil ? addEmailToSubscriptionURL : manageSubscriptionEmailURL
state.viewTitle = accountManager.email == nil ? UserText.subscriptionRestoreAddEmailTitle : UserText.subscriptionManageEmailTitle
state.viewTitle = accountManager.email == nil ? UserText.subscriptionRestoreAddEmailTitle : UserText.subscriptionEditEmailTitle

// Also we assume subscription requires managing, and not activation
state.managingSubscriptionEmail = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct SubscriptionSettingsView: View {
}),
isActive: $isShowingEmailView) {
if let email = viewModel.state.subscriptionEmail {
SettingsCellView(label: UserText.subscriptionManageEmailButton,
SettingsCellView(label: UserText.subscriptionEditEmailButton,
subtitle: email)
} else {
SettingsCellView(label: UserText.subscriptionAddEmailButton)
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/UserText.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ But if you *do* want a peek under the hood, you can find more information about
public static let subscriptionActivateEmailTitle = NSLocalizedString("subscription.activate.email.title", value: "Activate Subscription", comment: "Activate subscription title")
public static let subscriptionActivateEmailDescription = NSLocalizedString("subscription.activate.email.description", value: "Use your email to activate your subscription on this device.", comment: "Description for Email activation")
public static let subscriptionAddEmailButton = NSLocalizedString("subscription.activate.add.email.button", value: "Add Email", comment: "Button for adding email address to subscription")
public static let subscriptionManageEmailButton = NSLocalizedString("subscription.activate.manage.email.button", value: "Manage Email", comment: "Button for managing email address added to subscription")
public static let subscriptionEditEmailButton = NSLocalizedString("subscription.activate.edit.email.button", value: "Edit Email", comment: "Button for editing email address added to subscription")
public static let subscriptionActivateEmailButton = NSLocalizedString("subscription.activate.email.button", value: "Enter Email", comment: "Restore button title for Email")

// Add to other devices (AppleID / Email)
Expand All @@ -1099,7 +1099,7 @@ But if you *do* want a peek under the hood, you can find more information about
public static let subscriptionRestoreAddEmailTitle = NSLocalizedString("subscription.add.email.title", value: "Add Email", comment: "View title for adding email to subscription")

// Manage Subscription Email
public static let subscriptionManageEmailTitle = NSLocalizedString("subscription.activate.manage.email.title", value: "Manage Email", comment: "View Title for managing your email account")
public static let subscriptionEditEmailTitle = NSLocalizedString("subscription.activate.edit.email.title", value: "Edit Email", comment: "View Title for editing your email account")
public static let subscriptionManageEmailCancelButton = NSLocalizedString("subscription.activate.manage.email.cancel", value: "Cancel", comment: "Button title for cancelling email deletion")
public static let subscriptionManageEmailOKButton = NSLocalizedString("subscription.activate.manage.email.OK", value: "OK", comment: "Button title for confirming email deletion")

Expand Down
12 changes: 6 additions & 6 deletions DuckDuckGo/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -1999,6 +1999,12 @@ But if you *do* want a peek under the hood, you can find more information about
/* Subscription Activation Info */
"subscription.activate.description" = "Your subscription is automatically available in DuckDuckGo on any device signed in to your Apple ID.";

/* Button for editing email address added to subscription */
"subscription.activate.edit.email.button" = "Edit Email";

/* View Title for editing your email account */
"subscription.activate.edit.email.title" = "Edit Email";

/* Email option for activation */
"subscription.activate.email" = "Email";

Expand All @@ -2011,18 +2017,12 @@ But if you *do* want a peek under the hood, you can find more information about
/* Activate subscription title */
"subscription.activate.email.title" = "Activate Subscription";

/* Button for managing email address added to subscription */
"subscription.activate.manage.email.button" = "Manage Email";

/* Button title for cancelling email deletion */
"subscription.activate.manage.email.cancel" = "Cancel";

/* Button title for confirming email deletion */
"subscription.activate.manage.email.OK" = "OK";

/* View Title for managing your email account */
"subscription.activate.manage.email.title" = "Manage Email";

/* Restore button title for AppleID */
"subscription.activate.restore.apple" = "Restore Purchase";

Expand Down

0 comments on commit 73cf88e

Please sign in to comment.