summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJon Petersson <jon.petersson@kvadrat.se>2024-05-30 16:00:47 +0200
committerBug Magnet <marco.nikic@mullvad.net>2024-06-10 15:53:15 +0200
commite815a4848d36e60bc862233af6c7f0a913d6beca (patch)
tree19601abee78acf0178c4c68e5803d4cf986a7284
parenta1618f8ccaf41b3090b567d999397a1b8bffea18 (diff)
downloadmullvadvpn-e815a4848d36e60bc862233af6c7f0a913d6beca.tar.xz
mullvadvpn-e815a4848d36e60bc862233af6c7f0a913d6beca.zip
Do not truncate ip override import description
-rw-r--r--ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatus.swift12
-rw-r--r--ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatusView.swift1
2 files changed, 7 insertions, 6 deletions
diff --git a/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatus.swift b/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatus.swift
index 42e03e8c76..928914ae68 100644
--- a/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatus.swift
+++ b/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatus.swift
@@ -73,19 +73,19 @@ enum IPOverrideStatus: Equatable, CustomStringConvertible {
case .active, .noImports:
""
case let .importFailed(context):
- NSLocalizedString(
+ String(format: NSLocalizedString(
"IP_OVERRIDE_STATUS_DESCRIPTION_INACTIVE",
tableName: "IPOverride",
- value: "Import \(context.description) was unsuccessful, please try again.",
+ value: "Import %@ was unsuccessful, please try again.",
comment: ""
- )
+ ), context.description)
case let .importSuccessful(context):
- NSLocalizedString(
+ String(format: NSLocalizedString(
"IP_OVERRIDE_STATUS_DESCRIPTION_INACTIVE",
tableName: "IPOverride",
- value: "Import \(context.description) was successful, overrides are now active.",
+ value: "Import %@ was successful, overrides are now active.",
comment: ""
- )
+ ), context.description)
}
}
}
diff --git a/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatusView.swift b/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatusView.swift
index 9c9838b6ea..b39572c846 100644
--- a/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatusView.swift
+++ b/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideStatusView.swift
@@ -24,6 +24,7 @@ class IPOverrideStatusView: UIView {
let label = UILabel()
label.font = .systemFont(ofSize: 12, weight: .semibold)
label.textColor = .white.withAlphaComponent(0.6)
+ label.numberOfLines = 0
return label
}()