diff --git a/Zavala/AppAssets.swift b/Zavala/AppAssets.swift index 9ce2c239..7812331f 100644 --- a/Zavala/AppAssets.swift +++ b/Zavala/AppAssets.swift @@ -207,7 +207,7 @@ extension String { static let documentNotFoundMessage = String(localized: "The requested document could not be found. It was most likely deleted and is no longer available.", comment: "Alert Message: Document Not Found") static let doneControlLabel = String(localized: "Done", comment: "Control Label: Done") static let duplicateControlLabel = String(localized: "Duplicate", comment: "Control Label: Duplicate") - static let duplicateRowControlLabel = String(localized: "Duplicate Row", comment: "Control Label: Duplicate Row") + static let duplicateRowsControlLabel = String(localized: "Duplicate Rows", comment: "Control Label: Duplicate Rows") static let editorControlLabel = String(localized: "Editor", comment: "Control Label: Editor") static let emailControlLabel = String(localized: "Email", comment: "Control Label: Email") diff --git a/Zavala/AppDelegate.swift b/Zavala/AppDelegate.swift index 8d389943..410073bd 100644 --- a/Zavala/AppDelegate.swift +++ b/Zavala/AppDelegate.swift @@ -115,7 +115,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, FileActionResponder { input: "{", modifierFlags: [.command]) - let deleteCurrentRowsCommand = UIKeyCommand(title: .deleteRowControlLabel, + let deleteCurrentRowsCommand = UIKeyCommand(title: .deleteRowsControlLabel, action: .deleteCurrentRows, input: UIKeyCommand.inputDelete, modifierFlags: [.shift, .command]) @@ -125,7 +125,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, FileActionResponder { input: "g", modifierFlags: [.alternate, .command]) - let duplicateRowsCommand = UIKeyCommand(title: .duplicateRowControlLabel, + let duplicateRowsCommand = UIKeyCommand(title: .duplicateRowsControlLabel, action: .duplicateCurrentRows, input: "r", modifierFlags: [.command, .control]) @@ -559,8 +559,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, FileActionResponder { createRowInsideCommand, createRowOutsideCommand, duplicateRowsCommand, - deleteCurrentRowsCommand, - groupCurrentRowsCommand]) + groupCurrentRowsCommand, + deleteCurrentRowsCommand + ]) let moveRowMenu = UIMenu(title: "", options: .displayInline, children: [moveRowsLeftCommand, moveRowsRightCommand, moveRowsUpCommand, moveRowsDownCommand]) let completeMenu = UIMenu(title: "", options: .displayInline, children: [toggleCompleteRowsCommand, deleteCompletedRowsCommand]) let noteMenu = UIMenu(title: "", options: .displayInline, children: [rowNotesCommand, deleteRowNotesCommand]) diff --git a/Zavala/Editor/EditorViewController.swift b/Zavala/Editor/EditorViewController.swift index 22bf1ad8..2cbaf953 100644 --- a/Zavala/Editor/EditorViewController.swift +++ b/Zavala/Editor/EditorViewController.swift @@ -3360,7 +3360,7 @@ private extension EditorViewController { func duplicateRows(_ rows: [Row]) { guard let undoManager, let outline else { return } - let command = DuplicateRowCommand(actionName: .duplicateRowControlLabel, + let command = DuplicateRowCommand(actionName: .duplicateRowsControlLabel, undoManager: undoManager, delegate: self, outline: outline, diff --git a/Zavala/Resources/Localizable.xcstrings b/Zavala/Resources/Localizable.xcstrings index d244de48..b8e0b185 100644 --- a/Zavala/Resources/Localizable.xcstrings +++ b/Zavala/Resources/Localizable.xcstrings @@ -337,8 +337,8 @@ "Duplicate" : { "comment" : "Control Label: Duplicate" }, - "Duplicate Row" : { - "comment" : "Control Label: Duplicate Row" + "Duplicate Rows" : { + "comment" : "Control Label: Duplicate Rows" }, "Edit document “%@”" : { "comment" : "Prompt: edit document"