Make the row context menu more consistent

vincode-io · Sep 14, 2024 · 1971965 · 1971965
1 parent 8b66829
commit 1971965
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Zavala/AppAssets.swift b/Zavala/AppAssets.swift
@@ -249,6 +249,7 @@ extension String {
 	static let goBackwardControlLabel = String(localized: "Go Backward", comment: "Control Label: Go Backward")
 	static let goForwardControlLabel = String(localized: "Go Forward", comment: "Control Label: Go Forward")
 	static let greenControlLabel = String(localized: "Green", comment: "Control Label: Green")
+	static let groupRowControlLabel = String(localized: "Group Row", comment: "Control Label: Group Row")
 	static let groupRowsControlLabel = String(localized: "Group Rows", comment: "Control Label: Group Rows")
 
 	static let helpControlLabel = String(localized: "Help", comment: "Control Label: Help")

diff --git a/Zavala/Editor/EditorViewController.swift b/Zavala/Editor/EditorViewController.swift
@@ -2917,7 +2917,8 @@ private extension EditorViewController {
 	}
 
 	func groupAction(rows: [Row]) -> UIAction {
-		return UIAction(title: .groupRowsControlLabel, image: .groupRows) { [weak self] action in
+		let title = rows.count == 1 ? String.groupRowControlLabel : String.groupRowsControlLabel
+		return UIAction(title: title, image: .groupRows) { [weak self] action in
 			self?.groupCurrentRows(rows)
 		}
 	}

diff --git a/Zavala/Resources/Localizable.xcstrings b/Zavala/Resources/Localizable.xcstrings
@@ -546,6 +546,9 @@
     "Green" : {
       "comment" : "Control Label: Green"
     },
+    "Group Row" : {
+      "comment" : "Control Label: Group Row"
+    },
     "Group Rows" : {
       "comment" : "Control Label: Group Rows"
     },