From 325109d7b8d15b12b07e79beba1626bf5fcd771a Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Tue, 11 Feb 2025 09:47:25 -0500 Subject: [PATCH] Remove preview strings from translation and add missing period to duplicate string to avoid double translation Signed-off-by: Terry Yiu --- damus/Components/SupporterBadge.swift | 8 ++++---- damus/Models/Purple/DamusPurple.swift | 2 +- .../Localized Contents/en-US.xliff | 10 ---------- .../damus/Localizable.xcstrings | 3 --- .../damus/en-US.lproj/Localizable.strings | Bin 184312 -> 181764 bytes 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/damus/Components/SupporterBadge.swift b/damus/Components/SupporterBadge.swift index d26962a1..9db4f9bd 100644 --- a/damus/Components/SupporterBadge.swift +++ b/damus/Components/SupporterBadge.swift @@ -245,7 +245,7 @@ struct SupporterBadge_Previews: PreviewProvider { .frame(width: 100) } - Text("Double star (just shape itself, with alt background color, to show it adapts to background well)") + Text(verbatim: "Double star (just shape itself, with alt background color, to show it adapts to background well)") .multilineTextAlignment(.center) if #available(iOS 17.0, *) { @@ -257,13 +257,13 @@ struct SupporterBadge_Previews: PreviewProvider { .background(Color.blue) } - Text("Double star (fallback for iOS 16 and below)") - + Text(verbatim: "Double star (fallback for iOS 16 and below)") + HStack(alignment: .center) { DoubleStar.Fallback(size: 17, starOffset: 5) } - Text("Double star (fallback for iOS 16 and below, with alt color limitation shown)") + Text(verbatim: "Double star (fallback for iOS 16 and below, with alt color limitation shown)") .multilineTextAlignment(.center) HStack(alignment: .center) { diff --git a/damus/Models/Purple/DamusPurple.swift b/damus/Models/Purple/DamusPurple.swift index 3ca36399..32bdb64e 100644 --- a/damus/Models/Purple/DamusPurple.swift +++ b/damus/Models/Purple/DamusPurple.swift @@ -388,7 +388,7 @@ class DamusPurple: StoreObserverDelegate { case .none: return .sheet(.error(.init( user_visible_description: NSLocalizedString("You clicked on a Purple welcome link, but we could not find your checkout. This is likely a bug.", comment: "Error label upon continuing in the app from a Damus Purple purchase"), - tip: NSLocalizedString("Please double-check the checkout web page, or go to the Side Menu → \"Purple\" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue", comment: "User-facing tips on what to do if a Purple welcome link doesn't work"), + tip: NSLocalizedString("Please double-check the checkout web page, or go to the Side Menu → \"Purple\" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue.", comment: "User-facing tips on what to do if a Purple welcome link doesn't work"), technical_info: "Handling Purple URL \"\(purple_url)\" failed, the `is_good_to_go` result was `\(String(describing: is_good_to_go))`" ))) } diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff index 4640d729..f51300ca 100644 --- a/damus/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -1771,11 +1771,6 @@ Section title for deleting the user Please choose relays from the list below to filter the current feed: Instructions on how to filter a specific timeline feed by choosing relay servers to filter on. - - Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue - Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue - User-facing tips on what to do if a Purple welcome link doesn't work - Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue. Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue. @@ -5381,11 +5376,6 @@ Section title for deleting the user Please choose relays from the list below to filter the current feed: Instructions on how to filter a specific timeline feed by choosing relay servers to filter on. - - Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue - Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue - User-facing tips on what to do if a Purple welcome link doesn't work - Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue. Please double-check the checkout web page, or go to the Side Menu → "Purple" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue. diff --git a/damus/en-US.xcloc/Source Contents/damus/Localizable.xcstrings b/damus/en-US.xcloc/Source Contents/damus/Localizable.xcstrings index 4c5b4a09..fac17447 100644 --- a/damus/en-US.xcloc/Source Contents/damus/Localizable.xcstrings +++ b/damus/en-US.xcloc/Source Contents/damus/Localizable.xcstrings @@ -1069,9 +1069,6 @@ "Please choose relays from the list below to filter the current feed:" : { "comment" : "Instructions on how to filter a specific timeline feed by choosing relay servers to filter on." }, - "Please double-check the checkout web page, or go to the Side Menu → \"Purple\" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue" : { - "comment" : "User-facing tips on what to do if a Purple welcome link doesn't work" - }, "Please double-check the checkout web page, or go to the Side Menu → \"Purple\" to check your account status. If you have already paid, but still don't see your account active, please save the URL of the checkout page where you came from, contact our support, and give us the URL to help you with this issue." : { "comment" : "User-facing tips on what to do if a Purple welcome link doesn't work" }, diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings index c822945e0f5cf04d109f1a6bf32668dbfb4a78a9..6ac970c1849b6878d655c51840424dced51a5ad0 100644 GIT binary patch delta 29 ncmV+&0OJ4np9_SH3$S?7m$1D78nYDFDA$LsvjMlRvjR#S+u;q} delta 934 zcmZqa;r=n7dqc&g$qF1S(|?sSy4AZd13eaK>h=TKn_qg7o>uTA#wVA2S(9)68ub- zmkGFu57|*rH!*4w6HHma=m$kRDDpFao-F_;1d!*8!4aCqfZb|XvPcI82q+0b5&