From 90a4cada8228fee74694a66d97a40435ba4f2b1b Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 1 Sep 2018 14:03:43 +0200 Subject: [PATCH] add missing descriptions --- pkg/gui/keybindings.go | 38 +++++++++++++++++++++++++++++--------- pkg/i18n/english.go | 23 +++++++++++++++++++++++ 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index b6f837f8e..0a6db141b 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -76,35 +76,30 @@ func (gui *Gui) getKeybindings() []Binding { Key: 'e', Modifier: gocui.ModNone, Handler: gui.handleEditConfig, - KeyReadable: "e", Description: gui.Tr.SLocalize("EditConfig"), }, { ViewName: "status", Key: 'o', Modifier: gocui.ModNone, Handler: gui.handleOpenConfig, - KeyReadable: "o", Description: gui.Tr.SLocalize("OpenConfig"), }, { ViewName: "status", Key: 'u', Modifier: gocui.ModNone, Handler: gui.handleCheckForUpdate, - KeyReadable: "u", Description: gui.Tr.SLocalize("CheckForUpdate"), }, { ViewName: "files", Key: 'c', Modifier: gocui.ModNone, Handler: gui.handleCommitPress, - KeyReadable: "c", Description: gui.Tr.SLocalize("CommitChanges"), }, { ViewName: "files", Key: 'C', Modifier: gocui.ModNone, Handler: gui.handleCommitEditorPress, - KeyReadable: "C", Description: gui.Tr.SLocalize("CommitChangesWithEditor"), }, { ViewName: "files", @@ -112,25 +107,29 @@ func (gui *Gui) getKeybindings() []Binding { Modifier: gocui.ModNone, Handler: gui.handleFilePress, }, { - ViewName: "files", - Key: 'd', - Modifier: gocui.ModNone, - Handler: gui.handleFileRemove, + ViewName: "files", + Key: 'd', + Modifier: gocui.ModNone, + Handler: gui.handleFileRemove, + Description: gui.Tr.SLocalize("removeFile"), }, { ViewName: "files", Key: 'm', Modifier: gocui.ModNone, Handler: gui.handleSwitchToMerge, + Description: gui.Tr.SLocalize("resolveMergeConflicts"), }, { ViewName: "files", Key: 'e', Modifier: gocui.ModNone, Handler: gui.handleFileEdit, + Description: gui.Tr.SLocalize("editFile"), }, { ViewName: "files", Key: 'o', Modifier: gocui.ModNone, Handler: gui.handleFileOpen, + Description: gui.Tr.SLocalize("openFile"), }, { ViewName: "files", Key: 's', @@ -146,36 +145,43 @@ func (gui *Gui) getKeybindings() []Binding { Key: 'i', Modifier: gocui.ModNone, Handler: gui.handleIgnoreFile, + Description: gui.Tr.SLocalize("ignoreFile"), }, { ViewName: "files", Key: 'r', Modifier: gocui.ModNone, Handler: gui.handleRefreshFiles, + Description: gui.Tr.SLocalize("refreshFiles"), }, { ViewName: "files", Key: 'S', Modifier: gocui.ModNone, Handler: gui.handleStashSave, + Description: gui.Tr.SLocalize("stashFiles"), }, { ViewName: "files", Key: 'A', Modifier: gocui.ModNone, Handler: gui.handleAbortMerge, + Description: gui.Tr.SLocalize("abortMerge"), }, { ViewName: "files", Key: 'a', Modifier: gocui.ModNone, Handler: gui.handleStageAll, + Description: gui.Tr.SLocalize("toggleStagedAll"), }, { ViewName: "files", Key: 't', Modifier: gocui.ModNone, Handler: gui.handleAddPatch, + Description: gui.Tr.SLocalize("addPatch"), }, { ViewName: "files", Key: 'D', Modifier: gocui.ModNone, Handler: gui.handleResetHard, + Description: gui.Tr.SLocalize("resetHard"), }, { ViewName: "main", Key: gocui.KeyEsc, @@ -246,66 +252,80 @@ func (gui *Gui) getKeybindings() []Binding { Key: 'c', Modifier: gocui.ModNone, Handler: gui.handleCheckoutByName, + Description: gui.Tr.SLocalize("checkoutByName"), }, { ViewName: "branches", Key: 'F', Modifier: gocui.ModNone, Handler: gui.handleForceCheckout, + Description: gui.Tr.SLocalize("forceCheckout"), }, { ViewName: "branches", Key: 'n', Modifier: gocui.ModNone, Handler: gui.handleNewBranch, + Description: gui.Tr.SLocalize("newBranch"), }, { ViewName: "branches", Key: 'd', Modifier: gocui.ModNone, Handler: gui.handleDeleteBranch, + Description: gui.Tr.SLocalize("deleteBranch"), }, { ViewName: "branches", Key: 'D', Modifier: gocui.ModNone, Handler: gui.handleForceDeleteBranch, + Description: gui.Tr.SLocalize("forceDeleteBranch"), }, { ViewName: "branches", Key: 'm', Modifier: gocui.ModNone, Handler: gui.handleMerge, + Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"), }, { ViewName: "commits", Key: 's', Modifier: gocui.ModNone, Handler: gui.handleCommitSquashDown, + Description: gui.Tr.SLocalize("squashDown"), }, { ViewName: "commits", Key: 'r', Modifier: gocui.ModNone, Handler: gui.handleRenameCommit, + Description: gui.Tr.SLocalize("RenameCommit"), }, { ViewName: "commits", Key: 'g', Modifier: gocui.ModNone, Handler: gui.handleResetToCommit, + Description: gui.Tr.SLocalize("resetToThisCommit"), }, { ViewName: "commits", Key: 'f', Modifier: gocui.ModNone, Handler: gui.handleCommitFixup, + Description: gui.Tr.SLocalize("fixupCommit"), }, { ViewName: "stash", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: gui.handleStashApply, + KeyReadable: "space", + Description: gui.Tr.SLocalize("apply"), }, { ViewName: "stash", Key: 'g', Modifier: gocui.ModNone, Handler: gui.handleStashPop, + Description: gui.Tr.SLocalize("pop"), }, { ViewName: "stash", Key: 'd', Modifier: gocui.ModNone, Handler: gui.handleStashDrop, + Description: gui.Tr.SLocalize("drop"), }, { ViewName: "commitMessage", Key: gocui.KeyEnter, diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 83931ac73..54bf213bf 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -354,6 +354,29 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "GitconfigParseErr", Other: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`, + + // KEYBINDINGS DESCRIPTIONS + }, &i18n.Message{ + ID: "removeFile", + Other: `delete if untracked checkout if tracked (aka go away)`, + }, &i18n.Message{ + ID: "editFile", + Other: `edit file`, + }, &i18n.Message{ + ID: "openFile", + Other: `open file`, + }, &i18n.Message{ + ID: "ignoreFile", + Other: `add to .gitignore`, + }, &i18n.Message{ + ID: "refreshFiles", + Other: `refresh files`, + }, &i18n.Message{ + ID: "resetHard", + Other: `reset hard`, + }, &i18n.Message{ + ID: "mergeIntoCurrentBranch", + Other: `merge into currently checked out branch`, }, ) }