From dbb01b028deab71b3f4a3f5f5f251a0b56d5c9d6 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 2 Mar 2019 20:24:13 +1100 Subject: [PATCH] populate dutch and polish i18n files with new messages --- pkg/gui/commits_panel.go | 6 +- pkg/gui/keybindings.go | 10 --- pkg/i18n/dutch.go | 165 ++++++++++++++++++++++++++++++++++++--- pkg/i18n/english.go | 30 ++++--- pkg/i18n/polish.go | 153 ++++++++++++++++++++++++++++++++++-- 5 files changed, 323 insertions(+), 41 deletions(-) diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 7ca68767a..09c951cd2 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -271,8 +271,7 @@ func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error { return nil } - // TODO: i18n - return gui.createConfirmationPanel(gui.g, v, "Delete Commit", "Are you sure you want to delete this commit?", func(*gocui.Gui, *gocui.View) error { + return gui.createConfirmationPanel(gui.g, v, gui.Tr.SLocalize("DeleteCommitTitle"), gui.Tr.SLocalize("DeleteCommitPrompt"), func(*gocui.Gui, *gocui.View) error { err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "drop") return gui.handleGenericMergeCommandResult(err) }, nil) @@ -335,8 +334,7 @@ func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error { - // TODO: i18n - return gui.createConfirmationPanel(gui.g, v, "Amend Commit", "Are you sure you want to amend this commit with your staged files?", func(*gocui.Gui, *gocui.View) error { + return gui.createConfirmationPanel(gui.g, v, gui.Tr.SLocalize("AmendCommitTitle"), gui.Tr.SLocalize("AmendCommitPrompt"), func(*gocui.Gui, *gocui.View) error { err := gui.GitCommand.AmendTo(gui.State.Commits[gui.State.Panels.Commits.SelectedLine].Sha) return gui.handleGenericMergeCommandResult(err) }, nil) diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index eb49fe672..3504d8e03 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -563,16 +563,6 @@ func (gui *Gui) GetContextMap() map[string]map[string][]*Binding { Key: gocui.MouseWheelDown, Modifier: gocui.ModNone, Handler: gui.handleStagingNextLine, - }, { - ViewName: "main", - Key: gocui.KeyArrowLeft, - Modifier: gocui.ModNone, - Handler: gui.handleStagingPrevLine, - }, { - ViewName: "main", - Key: gocui.MouseWheelDown, - Modifier: gocui.ModNone, - Handler: gui.handleStagingNextLine, }, { ViewName: "main", Key: gocui.KeyArrowLeft, diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 851febcac..6f0ec66dd 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -193,9 +193,6 @@ func addDutch(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "rebaseBranch", Other: "rebase branch", - }, &i18n.Message{ - ID: "CantRebaseOntoSelf", - Other: "You cannot rebase a branch onto itself", }, &i18n.Message{ ID: "CantMergeBranchIntoItself", Other: "Je kan niet een branch in zichzelf mergen", @@ -280,9 +277,6 @@ func addDutch(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "PotentialErrInGetselectedCommit", Other: "Er is mogelijk een error in getSelected Commit (geen match tussen ui en state)", - }, &i18n.Message{ - ID: "NoCommitsThisBranch", - Other: "Geen commits voor deze branch", }, &i18n.Message{ ID: "Error", Other: "Foutmelding", @@ -346,9 +340,6 @@ func addDutch(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "CantCloseConfirmationPrompt", Other: "Kon de bevestiging prompt niet sluiten: {{.error}}", - }, &i18n.Message{ - ID: "NoChangedFiles", - Other: "Geen veranderde files", }, &i18n.Message{ ID: "ClearFilePanel", Other: "maak bestandsvenster leeg", @@ -472,15 +463,165 @@ func addDutch(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "ConfirmMerge", Other: "Are you sure you want to merge {{.selectedBranch}} into {{.checkedOutBranch}}?", - }, &i18n.Message{}, &i18n.Message{ + }, &i18n.Message{ ID: "FwdNoUpstream", Other: "Cannot fast-forward a branch with no upstream", + }, &i18n.Message{ + ID: "ErrorOccurred", + Other: "An error occurred! Please create an issue at https://github.com/jesseduffield/lazygit/issues", }, &i18n.Message{ ID: "FwdCommitsToPush", Other: "Cannot fast-forward a branch with commits to push", }, &i18n.Message{ - ID: "ErrorOccurred", - Other: "An error occurred! Please create an issue at https://github.com/jesseduffield/lazygit/issues", + ID: "MainTitle", + Other: "Main", + }, &i18n.Message{ + ID: "NormalTitle", + Other: "Normal", + }, &i18n.Message{ + ID: "softReset", + Other: "soft reset to last commit", + }, &i18n.Message{ + ID: "SoftReset", + Other: "Soft reset", + }, &i18n.Message{ + ID: "ConfirmSoftReset", + Other: "Are you sure you want to `reset --soft HEAD^`? The changes in your topmost commit will be placed in your working tree", + }, &i18n.Message{ + ID: "CantRebaseOntoSelf", + Other: "You cannot rebase a branch onto itself", + }, &i18n.Message{ + ID: "SureSquashThisCommit", + Other: "Are you sure you want to squash this commit into the commit below?", + }, &i18n.Message{ + ID: "Squash", + Other: "Squash", + }, &i18n.Message{ + ID: "pickCommit", + Other: "pick commit (when mid-rebase)", + }, &i18n.Message{ + ID: "revertCommit", + Other: "revert commit", + }, &i18n.Message{ + ID: "deleteCommit", + Other: "delete commit", + }, &i18n.Message{ + ID: "moveDownCommit", + Other: "move commit down one", + }, &i18n.Message{ + ID: "moveUpCommit", + Other: "move commit up one", + }, &i18n.Message{ + ID: "editCommit", + Other: "edit commit", + }, &i18n.Message{ + ID: "amendToCommit", + Other: "amend commit with staged changes", + }, &i18n.Message{ + ID: "FoundConflicts", + Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", + }, &i18n.Message{ + ID: "FoundConflictsTitle", + Other: "Auto-merge failed", + }, &i18n.Message{ + ID: "Undo", + Other: "undo", + }, &i18n.Message{ + ID: "PickHunk", + Other: "pick hunk", + }, &i18n.Message{ + ID: "PickBothHunks", + Other: "pick both hunks", + }, &i18n.Message{ + ID: "ViewMergeRebaseOptions", + Other: "view merge/rebase options", + }, &i18n.Message{ + ID: "NotMergingOrRebasing", + Other: "You are currently neither rebasing nor merging", + }, &i18n.Message{ + ID: "RecentRepos", + Other: "recent repositories", + }, &i18n.Message{ + ID: "MergeOptionsTitle", + Other: "Merge Options", + }, &i18n.Message{ + ID: "RebaseOptionsTitle", + Other: "Rebase Options", + }, &i18n.Message{ + ID: "ConflictsResolved", + Other: "all merge conflicts resolved. Continue?", + }, &i18n.Message{ + ID: "NoRoom", + Other: "Not enough room", + }, &i18n.Message{ + ID: "YouAreHere", + Other: "YOU ARE HERE", + }, &i18n.Message{ + ID: "rewordNotSupported", + Other: "rewording commits while interactively rebasing is not currently supported", + }, &i18n.Message{ + ID: "cherryPickCopy", + Other: "copy commit (cherry-pick)", + }, &i18n.Message{ + ID: "cherryPickCopyRange", + Other: "copy commit range (cherry-pick)", + }, &i18n.Message{ + ID: "pasteCommits", + Other: "paste commits (cherry-pick)", + }, &i18n.Message{ + ID: "SureCherryPick", + Other: "Are you sure you want to cherry-pick the copied commits onto this branch?", + }, &i18n.Message{ + ID: "CherryPick", + Other: "Cherry-Pick", + }, &i18n.Message{ + ID: "CannotRebaseOntoFirstCommit", + Other: "You cannot interactive rebase onto the first commit", + }, &i18n.Message{ + ID: "Donate", + Other: "Donate", + }, &i18n.Message{ + ID: "PrevLine", + Other: "select previous line", + }, &i18n.Message{ + ID: "NextLine", + Other: "select next line", + }, &i18n.Message{ + ID: "PrevHunk", + Other: "select previous hunk", + }, &i18n.Message{ + ID: "NextHunk", + Other: "select next hunk", + }, &i18n.Message{ + ID: "PrevConflict", + Other: "select previous conflict", + }, &i18n.Message{ + ID: "NextConflict", + Other: "select next conflict", + }, &i18n.Message{ + ID: "SelectTop", + Other: "select top hunk", + }, &i18n.Message{ + ID: "SelectBottom", + Other: "select bottom hunk", + }, &i18n.Message{ + ID: "ScrollDown", + Other: "scroll down", + }, &i18n.Message{ + ID: "ScrollUp", + Other: "scroll up", + }, &i18n.Message{ + ID: "AmendCommitTitle", + Other: "Amend Commit", + }, &i18n.Message{ + ID: "AmendCommitPrompt", + Other: "Are you sure you want to amend this commit with your staged files?", + }, &i18n.Message{ + ID: "DeleteCommitTitle", + Other: "Delete Commit", + }, &i18n.Message{ + ID: "DeleteCommitPrompt", + Other: "Are you sure you want to delete this commit?", }, ) } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 79c1e9854..de6b55d6c 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -299,16 +299,16 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "Are you sure you want to 'fixup' this commit? It will be merged into the commit below", }, &i18n.Message{ ID: "SureSquashThisCommit", - Other: "Are you sure you want to squash this commit into the commit below?", // TODO: i18n + Other: "Are you sure you want to squash this commit into the commit below?", }, &i18n.Message{ ID: "Squash", - Other: "Squash", // TODO: i18n + Other: "Squash", }, &i18n.Message{ ID: "pickCommit", - Other: "pick commit (when mid-rebase)", // TODO: i18n + Other: "pick commit (when mid-rebase)", }, &i18n.Message{ ID: "revertCommit", - Other: "revert commit", // TODO: i18n + Other: "revert commit", }, &i18n.Message{ ID: "OnlyRenameTopCommit", Other: "Can only reword topmost commit from within lazygit. Use shift+R instead", @@ -317,19 +317,19 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "reword commit", }, &i18n.Message{ ID: "deleteCommit", - Other: "delete commit", // TODO: other languages + Other: "delete commit", }, &i18n.Message{ ID: "moveDownCommit", - Other: "move commit down one", // TODO: other languages + Other: "move commit down one", }, &i18n.Message{ ID: "moveUpCommit", - Other: "move commit up one", // TODO: other languages + Other: "move commit up one", }, &i18n.Message{ ID: "editCommit", - Other: "edit commit", // TODO: other languages + Other: "edit commit", }, &i18n.Message{ ID: "amendToCommit", - Other: "amend commit with staged changes", // TODO: other languages + Other: "amend commit with staged changes", }, &i18n.Message{ ID: "renameCommitEditor", Other: "rename commit with editor", @@ -633,6 +633,18 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "ScrollUp", Other: "scroll up", + }, &i18n.Message{ + ID: "AmendCommitTitle", + Other: "Amend Commit", + }, &i18n.Message{ + ID: "AmendCommitPrompt", + Other: "Are you sure you want to amend this commit with your staged files?", + }, &i18n.Message{ + ID: "DeleteCommitTitle", + Other: "Delete Commit", + }, &i18n.Message{ + ID: "DeleteCommitPrompt", + Other: "Are you sure you want to delete this commit?", }, ) } diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 205ec9d6c..6cef94b2c 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -269,9 +269,6 @@ func addPolish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "PotentialErrInGetselectedCommit", Other: "potencjalny błąd w getSelected Commit (niedopasowane ui i stan)", - }, &i18n.Message{ - ID: "NoCommitsThisBranch", - Other: "Brak commitów dla tej gałęzi", }, &i18n.Message{ ID: "Error", Other: "Błąd", @@ -335,9 +332,6 @@ func addPolish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "CantCloseConfirmationPrompt", Other: "Nie można zamknąć monitu potwierdzenia: {{.error}}", - }, &i18n.Message{ - ID: "NoChangedFiles", - Other: "Brak zmienionych plików", }, &i18n.Message{ ID: "ClearFilePanel", Other: "Wyczyść panel plików", @@ -464,6 +458,153 @@ func addPolish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "ErrorOccurred", Other: "An error occurred! Please create an issue at https://github.com/jesseduffield/lazygit/issues", + }, &i18n.Message{ + ID: "MainTitle", + Other: "Main", + }, &i18n.Message{ + ID: "NormalTitle", + Other: "Normal", + }, &i18n.Message{ + ID: "softReset", + Other: "soft reset to last commit", + }, &i18n.Message{ + ID: "SoftReset", + Other: "Soft reset", + }, &i18n.Message{ + ID: "ConfirmSoftReset", + Other: "Are you sure you want to `reset --soft HEAD^`? The changes in your topmost commit will be placed in your working tree", + }, &i18n.Message{ + ID: "SureSquashThisCommit", + Other: "Are you sure you want to squash this commit into the commit below?", + }, &i18n.Message{ + ID: "Squash", + Other: "Squash", + }, &i18n.Message{ + ID: "pickCommit", + Other: "pick commit (when mid-rebase)", + }, &i18n.Message{ + ID: "revertCommit", + Other: "revert commit", + }, &i18n.Message{ + ID: "deleteCommit", + Other: "delete commit", + }, &i18n.Message{ + ID: "moveDownCommit", + Other: "move commit down one", + }, &i18n.Message{ + ID: "moveUpCommit", + Other: "move commit up one", + }, &i18n.Message{ + ID: "editCommit", + Other: "edit commit", + }, &i18n.Message{ + ID: "amendToCommit", + Other: "amend commit with staged changes", + }, &i18n.Message{ + ID: "FoundConflicts", + Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", + }, &i18n.Message{ + ID: "FoundConflictsTitle", + Other: "Auto-merge failed", + }, &i18n.Message{ + ID: "Undo", + Other: "undo", + }, &i18n.Message{ + ID: "PickHunk", + Other: "pick hunk", + }, &i18n.Message{ + ID: "PickBothHunks", + Other: "pick both hunks", + }, &i18n.Message{ + ID: "ViewMergeRebaseOptions", + Other: "view merge/rebase options", + }, &i18n.Message{ + ID: "NotMergingOrRebasing", + Other: "You are currently neither rebasing nor merging", + }, &i18n.Message{ + ID: "RecentRepos", + Other: "recent repositories", + }, &i18n.Message{ + ID: "MergeOptionsTitle", + Other: "Merge Options", + }, &i18n.Message{ + ID: "RebaseOptionsTitle", + Other: "Rebase Options", + }, &i18n.Message{ + ID: "ConflictsResolved", + Other: "all merge conflicts resolved. Continue?", + }, &i18n.Message{ + ID: "NoRoom", + Other: "Not enough room", + }, &i18n.Message{ + ID: "YouAreHere", + Other: "YOU ARE HERE", + }, &i18n.Message{ + ID: "rewordNotSupported", + Other: "rewording commits while interactively rebasing is not currently supported", + }, &i18n.Message{ + ID: "cherryPickCopy", + Other: "copy commit (cherry-pick)", + }, &i18n.Message{ + ID: "cherryPickCopyRange", + Other: "copy commit range (cherry-pick)", + }, &i18n.Message{ + ID: "pasteCommits", + Other: "paste commits (cherry-pick)", + }, &i18n.Message{ + ID: "SureCherryPick", + Other: "Are you sure you want to cherry-pick the copied commits onto this branch?", + }, &i18n.Message{ + ID: "CherryPick", + Other: "Cherry-Pick", + }, &i18n.Message{ + ID: "CannotRebaseOntoFirstCommit", + Other: "You cannot interactive rebase onto the first commit", + }, &i18n.Message{ + ID: "Donate", + Other: "Donate", + }, &i18n.Message{ + ID: "PrevLine", + Other: "select previous line", + }, &i18n.Message{ + ID: "NextLine", + Other: "select next line", + }, &i18n.Message{ + ID: "PrevHunk", + Other: "select previous hunk", + }, &i18n.Message{ + ID: "NextHunk", + Other: "select next hunk", + }, &i18n.Message{ + ID: "PrevConflict", + Other: "select previous conflict", + }, &i18n.Message{ + ID: "NextConflict", + Other: "select next conflict", + }, &i18n.Message{ + ID: "SelectTop", + Other: "select top hunk", + }, &i18n.Message{ + ID: "SelectBottom", + Other: "select bottom hunk", + }, &i18n.Message{ + ID: "ScrollDown", + Other: "scroll down", + }, &i18n.Message{ + ID: "ScrollUp", + Other: "scroll up", + }, &i18n.Message{ + ID: "AmendCommitTitle", + Other: "Amend Commit", + }, &i18n.Message{ + ID: "AmendCommitPrompt", + Other: "Are you sure you want to amend this commit with your staged files?", + }, &i18n.Message{ + ID: "DeleteCommitTitle", + Other: "Delete Commit", + }, &i18n.Message{ + ID: "DeleteCommitPrompt", + Other: "Are you sure you want to delete this commit?", }, ) }