go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-13 01:30:53 +02:00
Code Issues Releases Activity

Use a better name for the auto-stash for checking out a branch

Browse Source
This commit is contained in:
Stefan Haller
2025-07-03 16:44:44 +02:00
parent a83fc5e343
commit 908975c758
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/helpers/refs_helper.go
View File

@ -79,7 +79,7 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
Prompt: self.c.Tr.AutoStashPrompt, Prompt: self.c.Tr.AutoStashPrompt,
HandleConfirm: func() error { HandleConfirm: func() error {
return withCheckoutStatus(func(gocui.Task) error { return withCheckoutStatus(func(gocui.Task) error {
if err := self.c.Git().Stash.Push(self.c.Tr.StashPrefix + ref); err != nil { if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForCheckout, ref)); err != nil {
return err return err
} }
if err := self.c.Git().Branch.Checkout(ref, cmdOptions); err != nil { if err := self.c.Git().Branch.Checkout(ref, cmdOptions); err != nil {

2
pkg/i18n/english.go
View File

@ -449,6 +449,7 @@ type TranslationSet struct {
AutoStashPrompt string AutoStashPrompt string
StashPrefix string StashPrefix string
AutoStashForUndo string AutoStashForUndo string
AutoStashForCheckout string
Discard string Discard string
DiscardChangesTitle string DiscardChangesTitle string
DiscardFileChangesTooltip string DiscardFileChangesTooltip string
@ -1543,6 +1544,7 @@ func EnglishTranslationSet() *TranslationSet {
AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)", AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)",
StashPrefix: "Auto-stashing changes for ", StashPrefix: "Auto-stashing changes for ",
AutoStashForUndo: "Auto-stashing changes for undoing to %s", AutoStashForUndo: "Auto-stashing changes for undoing to %s",
AutoStashForCheckout: "Auto-stashing changes for checking out %s",
Discard: "Discard", Discard: "Discard",
DiscardFileChangesTooltip: "View options for discarding changes to the selected file.", DiscardFileChangesTooltip: "View options for discarding changes to the selected file.",
DiscardChangesTitle: "Discard changes", DiscardChangesTitle: "Discard changes",