Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Ref #8431: Copy mistake in confirmation message after resetting VPN config #8443

Merged
merged 2 commits into from
Nov 20, 2023
Merged

Ref #8431: Copy mistake in confirmation message after resetting VPN config #8443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95b5509
Changed text for error with success case for reset configuration
soner-yuksel Nov 17, 2023
74b34c6
String localization duplicated key change
soner-yuksel Nov 20, 2023
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
15 changes: 10 additions & 5 deletions Sources/BraveStrings/BraveStrings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2821,7 +2821,7 @@ extension Strings {
comment: "Button to manage your VPN subscription")

public static let settingsRedeemOfferCode =
NSLocalizedString("vpn.settingsManageSubscription", tableName: "BraveShared", bundle: .module,
NSLocalizedString("vpn.settingsRedeemOfferCode", tableName: "BraveShared", bundle: .module,
value: "Redeem Offer Code",
comment: "Button to redeem offer code subscription")

Expand Down Expand Up @@ -3067,22 +3067,27 @@ extension Strings {

public static let resetVPNErrorTitle =
NSLocalizedString("vpn.resetVPNErrorTitle", tableName: "BraveShared", bundle: .module,
value: "Error",
value: "Reset Failed",
comment: "Title for error message when vpn configuration reset fails.")

public static let resetVPNErrorBody =
NSLocalizedString("vpn.resetVPNErrorBody", tableName: "BraveShared", bundle: .module,
value: "Failed to reset vpn configuration, please try again later.",
value: "Unable to reset VPN configuration. Please try again. If the issue persists, contact support for assistance.",
comment: "Message to show when vpn configuration reset fails.")

public static let resetVPNErrorButtonActionTitle =
NSLocalizedString("vpn.resetVPNErrorButtonActionTitle", tableName: "BraveShared", bundle: .module,
value: "Try Again",
comment: "Title of button to try again when vpn configuration reset fails.")

public static let resetVPNSuccessTitle =
NSLocalizedString("vpn.resetVPNSuccessTitle", tableName: "BraveShared", bundle: .module,
value: "Success",
value: "Reset Successful",
comment: "Title for success message when vpn configuration reset succeeds.")

public static let resetVPNSuccessBody =
NSLocalizedString("vpn.resetVPNSuccessBody", tableName: "BraveShared", bundle: .module,
value: "VPN Configuration is reset successfully.",
value: "VPN configuration has been reset successfully.",
comment: "Message to show when vpn configuration reset succeeds.")

public static let contactFormDoNotEditText =
Expand Down
13 changes: 11 additions & 2 deletions Sources/BraveVPN/BraveVPNSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,17 @@ public class BraveVPNSettingsViewController: TableViewController {
message: success ? Strings.VPN.resetVPNSuccessBody : Strings.VPN.resetVPNErrorBody,
preferredStyle: .alert)

let okAction = UIAlertAction(title: Strings.OKString, style: .default)
alert.addAction(okAction)
if success {
let okAction = UIAlertAction(title: Strings.OKString, style: .default)
alert.addAction(okAction)
} else {
alert.addAction(UIAlertAction(title: Strings.close, style: .cancel, handler: nil))
alert.addAction(UIAlertAction(
title: Strings.VPN.resetVPNErrorButtonActionTitle, style: .default,
handler: { [weak self] _ in
self?.resetConfigurationTapped()
}))
}

present(alert, animated: true)
}
Expand Down