Fix period abbreviated when multiple days/weeks/months/years

RevenueCatUI/Templates/V2/Variables/VariableHandlerV2.swift

@@ -167,6 +167,10 @@ private enum VariableLocalizationKey: String {
     case numYearFew = "num_year_few"
     case numYearMany = "num_year_many"
     case numYearOther = "num_year_other"
+    case numDaysShort = "num_days_short"
+    case numWeeksShort = "num_weeks_short"
+    case numMonthsShort = "num_months_short"
+    case numYearsShort = "num_years_short"
 }
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
@@ -336,6 +340,11 @@ extension VariablesV2 {
             return ""
         }
 
+        // Ex: "3 months" will return as "3 months"
+        if period.value > 1 {
+            return self.productPeriodWithUnit(package: package, localizations: localizations)
+        }
+
         let value: String
         switch period.unit {
         case .day:
@@ -372,15 +381,43 @@ extension VariablesV2 {
             return ""
         }
 
-        return localizations[period.periodLocalizationKey] ?? ""
+        if period.value > 1 {
+            return self.productPeriodWithUnit(package: package, localizations: localizations)
+        } else {
+            return localizations[period.periodLocalizationKey] ?? ""
+        }
     }
 
     func productPeriodAbbreviated(package: Package, localizations: [String: String]) -> String {
         guard let period = package.storeProduct.subscriptionPeriod else {
             return ""
         }
 
-        return localizations[period.periodAbbreviatedLocalizationKey] ?? ""
+        if period.value > 1 {
+            let localizedFormatKey: String
+            switch period.unit {
+            case .day:
+                localizedFormatKey = VariableLocalizationKey.numDaysShort.rawValue
+            case .week:
+                localizedFormatKey = VariableLocalizationKey.numWeeksShort.rawValue
+            case .month:
+                localizedFormatKey = VariableLocalizationKey.numMonthsShort.rawValue
+            case .year:
+                localizedFormatKey = VariableLocalizationKey.numYearsShort.rawValue
+            }
+
+            guard let localizedFormat = localizations[localizedFormatKey] else {
+                return ""
+            }
+            return String(format: localizedFormat, period.value)
+
+        } else {
+            guard let abbreviation = localizations[period.periodAbbreviatedLocalizationKey] else {
+                return ""
+            }
+
+            return abbreviation
+        }
     }
 
     func productPeriodInDays(package: Package) -> String {

Tests/RevenueCatUITests/PaywallsV2/VariableHandlerV2Tests.swift

@@ -64,7 +64,11 @@ class VariableHandlerV2Test: TestCase {
             "num_year_two": "%d years",
             "num_year_few": "%d years",
             "num_year_many": "%d years",
-            "num_year_other": "%d years"
+            "num_year_other": "%d years",
+            "num_days_short": "%dd",
+            "num_weeks_short": "%dwk",
+            "num_months_short": "%dmo",
+            "num_years_short": "%dyr"
         ]
     ]
 
@@ -116,6 +120,16 @@ class VariableHandlerV2Test: TestCase {
         expect(result).to(equal("monthly"))
     }
 
+    func testProductPeriodlyMultipleMonths() {
+        let result = variableHandler.processVariables(
+            in: "{{ product.periodly }}",
+            with: TestData.threeMonthPackage,
+            locale: locale,
+            localizations: localizations["en_US"]!
+        )
+        expect(result).to(equal("3 months"))
+    }
+
     func testProductPrice() {
         let result = variableHandler.processVariables(
             in: "{{ product.price }}",
@@ -136,6 +150,16 @@ class VariableHandlerV2Test: TestCase {
         expect(result).to(equal("$6.99/month"))
     }
 
+    func testProductPricePerPeriodMultipleMonths() {
+        let result = variableHandler.processVariables(
+            in: "{{ product.price_per_period }}",
+            with: TestData.threeMonthPackage,
+            locale: locale,
+            localizations: localizations["en_US"]!
+        )
+        expect(result).to(equal("$4.99/3 months"))
+    }
+
     func testProductPricePerPeriodAbbreviated() {
         let result = variableHandler.processVariables(
             in: "{{ product.price_per_period_abbreviated }}",
@@ -146,6 +170,16 @@ class VariableHandlerV2Test: TestCase {
         expect(result).to(equal("$6.99/mo"))
     }
 
+    func testProductPricePerPeriodAbbreviatedMultipleMonths() {
+        let result = variableHandler.processVariables(
+            in: "{{ product.price_per_period_abbreviated }}",
+            with: TestData.threeMonthPackage,
+            locale: locale,
+            localizations: localizations["en_US"]!
+        )
+        expect(result).to(equal("$4.99/3mo"))
+    }
+
     func testProductPricePerDay() {
         let result = variableHandler.processVariables(
             in: "{{ product.price_per_day }}",
@@ -196,6 +230,16 @@ class VariableHandlerV2Test: TestCase {
         expect(result).to(equal("month"))
     }
 
+    func testProductPeriodMultipleMonths() {
+        let result = variableHandler.processVariables(
+            in: "{{ product.period }}",
+            with: TestData.threeMonthPackage,
+            locale: locale,
+            localizations: localizations["en_US"]!
+        )
+        expect(result).to(equal("3 months"))
+    }
+
     func testProductPeriodAbbreviated() {
         let result = variableHandler.processVariables(
             in: "{{ product.period_abbreviated }}",
@@ -206,6 +250,16 @@ class VariableHandlerV2Test: TestCase {
         expect(result).to(equal("mo"))
     }
 
+    func testProductPeriodAbbreviatedMultipleMonths() {
+        let result = variableHandler.processVariables(
+            in: "{{ product.period_abbreviated }}",
+            with: TestData.threeMonthPackage,
+            locale: locale,
+            localizations: localizations["en_US"]!
+        )
+        expect(result).to(equal("3mo"))
+    }
+
     func testProductPeriodInDays() {
         let result = variableHandler.processVariables(
             in: "{{ product.period_in_days }}",