Removed PsiCash product description UI

Psiphon-Inc · Oct 28, 2022 · eeadc9a · eeadc9a
1 parent 7e19643
commit eeadc9a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/Psiphon/ProductRequest.swift b/Psiphon/ProductRequest.swift
@@ -45,14 +45,14 @@ var viewModel: PsiCashPurchasableViewModel? {
                 '\(product.productID)' is not a supported product
                 """)
         }
-        guard let title = formatter.string(from: psiCashProductID.psiCashAmount) else {
+        guard let formattedPsiCashAmount = formatter.string(from: psiCashProductID.psiCashAmount) else {
             return .parseError(reason:
                                 "Failed to format '\(psiCashProductID.psiCashAmount)' into string")
         }
         return .purchasable(
             PsiCashPurchasableViewModel(
                 product: .product(product),
-                title: title,
+                title: UserStrings.PsiCash_with_amount(formattedPsiCashAmount),
                 subtitle: product.localizedDescription,
                 localizedPrice: product.price,
                 clearedForSale: true

diff --git a/Psiphon/UserStrings.swift b/Psiphon/UserStrings.swift
@@ -38,6 +38,14 @@ import Foundation
         return "PsiCash"
     }
 
+    @objc static func PsiCash_with_amount(_ amount: String) -> String {
+        let format = NSLocalizedString("PSICASH_WITH_AMOUNT", tableName: nil, bundle: .main,
+                                 value: "%@ PsiCash",
+                                 comment: "Do not translate or transliterate 'PsiCash'. PsiCash is a unit of currency here. Reorder the format specifier '%@' if in the translated language ordering of unit and amount is different from English.")
+
+        return String.localizedStringWithFormat(format, amount);
+    }
+
     static func PsiCash_balance() -> String {
         return NSLocalizedString("PSICASH_BALANCE", tableName: nil, bundle: Bundle.main,
                                  value: "PsiCash Balance:",

diff --git a/Psiphon/View/PsiCashView/PsiCashCoinPurchaseTable.swift b/Psiphon/View/PsiCashView/PsiCashCoinPurchaseTable.swift
@@ -172,7 +172,6 @@ fileprivate final class PurchaseCellContent: UIView, Bindable {
     private let bottomPad: Float = -14
     private let priceFormatter: CurrencyFormatter
     private let titleLabel: UILabel
-    private let subtitleLabel: UILabel
     private let button: GradientButton
     private let spinner: UIActivityIndicatorView
     private let clickHandler: (PsiCashPurchasableViewModel.ProductType) -> Void
@@ -183,7 +182,6 @@ fileprivate final class PurchaseCellContent: UIView, Bindable {
         self.clickHandler = clickHandler
 
         titleLabel = UILabel.make(fontSize: .h3, typeface: .bold)
-        subtitleLabel = UILabel.make(fontSize: .subtitle, numberOfLines: 0)
         button = GradientButton(shadow: .light, contentShadow: false, gradient: .grey)
         spinner = .init(style: .gray)
         super.init(frame: .zero)
@@ -226,8 +224,7 @@ fileprivate final class PurchaseCellContent: UIView, Bindable {
         }
 
         titleStack.addArrangedSubviews(
-            titleLabel,
-            subtitleLabel
+            titleLabel
         )
 
         hStack.addArrangedSubviews(
@@ -280,11 +277,9 @@ fileprivate final class PurchaseCellContent: UIView, Bindable {
         // Forces title and subtitle text alignment, since they may not have translations.
         if case .rightToLeft = UIApplication.shared.userInterfaceLayoutDirection {
             titleLabel.textAlignment = .right
-            subtitleLabel.textAlignment = .right
         }
 
         titleLabel.text = newValue.title
-        subtitleLabel.text = newValue.subtitle
 
         button.setEventHandler { [unowned self] in
             self.clickHandler(newValue.product)

diff --git a/Shared/Strings/en.lproj/Localizable.strings b/Shared/Strings/en.lproj/Localizable.strings
@@ -627,6 +627,9 @@
 /* Message when the user has made a purchase, and paid successfully, however the transaction is not complete yet and is pending verification */
 "PSICASH_WAIT_TRANSACTION_VERIFIED" = "Please wait while your transaction is being verified";
 
+/* Do not translate or transliterate 'PsiCash'. PsiCash is a unit of currency here. Reorder the format specifier '%@' if in the translated language ordering of unit and amount is different from English. */
+"PSICASH_WITH_AMOUNT" = "%@ PsiCash";
+
 /* Alert message informing user that a Psiphon connection is required */
 "PSIPHON_CONNECTION_REQUIRED" = "Psiphon Connection Required";