Skip to content

Commit 381d92d

Browse files
authored
Merge pull request #5836 from selanthiraiyan/issue/5644-variants-word-in-products-list
Products List: Replace the word "variant" with "variation"
2 parents 826f8d7 + 1e56162 commit 381d92d

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

WooCommerce/Classes/ViewRelated/Products/View Models/ProductsTabProductViewModel.swift

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,34 @@ private extension EditableProductModel {
9292
return nil
9393
}
9494
let numberOfVariations = product.variations.count
95-
let singularFormat = NSLocalizedString("%ld variant", comment: "Label about one product variation shown on Products tab")
96-
let pluralFormat = NSLocalizedString("%ld variants", comment: "Label about number of variations shown on Products tab")
97-
let format = String.pluralize(numberOfVariations, singular: singularFormat, plural: pluralFormat)
95+
let format = String.pluralize(numberOfVariations,
96+
singular: Localization.VariationCount.singular,
97+
plural: Localization.VariationCount.plural)
9898
return String.localizedStringWithFormat(format, numberOfVariations)
9999
}
100100
}
101101

102+
// MARK: Localization
103+
//
104+
private extension EditableProductModel {
105+
enum Localization {
106+
enum VariationCount {
107+
static let singular = NSLocalizedString("%1$ld variation",
108+
comment: "Label about one product variation shown on Products tab. Reads, `1 variation`")
109+
static let plural = NSLocalizedString("%1$ld variations",
110+
comment: "Label about number of variations shown on Products tab. Reads, `2 variations`")
111+
}
112+
}
113+
}
114+
102115
private extension ProductsTabProductViewModel {
103116
enum Localization {
104-
static let noTitle = NSLocalizedString("(No Title)", comment: "Product title in Products list when there is no title")
117+
static let noTitle = NSLocalizedString("(No Title)",
118+
comment: "Product title in Products list when there is no title")
119+
105120
static func variationID(variationID: String) -> String {
106-
let titleFormat = NSLocalizedString("#%1$@", comment: "Variation ID. Parameters: %1$@ - Product variation ID")
121+
let titleFormat = NSLocalizedString("#%1$@",
122+
comment: "Variation ID. Parameters: %1$@ - Product variation ID")
107123
return String.localizedStringWithFormat(titleFormat, variationID)
108124
}
109125
}

WooCommerce/WooCommerceTests/ViewRelated/Products/ProductsTabProductViewModelTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ final class ProductsTabProductViewModelTests: XCTestCase {
7373
let detailsText = viewModel.detailsAttributedString.string
7474

7575
// Assert
76-
let singularFormat = NSLocalizedString("%ld variant", comment: "Label about one product variation shown on Products tab")
76+
let singularFormat = NSLocalizedString("%ld variation", comment: "Label about one product variation shown on Products tab")
7777
let expectedStockDetail = String.localizedStringWithFormat(singularFormat, variations.count)
7878
XCTAssertTrue(detailsText.contains(expectedStockDetail))
7979
}
@@ -88,7 +88,7 @@ final class ProductsTabProductViewModelTests: XCTestCase {
8888
let detailsText = viewModel.detailsAttributedString.string
8989

9090
// Assert
91-
let pluralFormat = NSLocalizedString("%ld variants", comment: "Label about number of variations shown on Products tab")
91+
let pluralFormat = NSLocalizedString("%ld variations", comment: "Label about number of variations shown on Products tab")
9292
let expectedStockDetail = String.localizedStringWithFormat(pluralFormat, variations.count)
9393
XCTAssertTrue(detailsText.contains(expectedStockDetail))
9494
}

0 commit comments

Comments
 (0)