go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-24 08:52:21 +02:00
Code Issues Releases Activity

Remove target branch from title of rebase menu

Browse Source 
Put it into the individual menu items instead.

Again, this is necessary because we are going to add another entry to the menu
that is independent of the selected branch.
This commit is contained in:
Stefan Haller 2024-05-04 16:12:40 +02:00
parent ddf5e24499
commit 837f7456ab
14 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -241,7 +241,9 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
}
menuItems := []*types.MenuItem{
{
Label: self.c.Tr.SimpleRebase,
Label: utils.ResolvePlaceholderString(self.c.Tr.SimpleRebase,
map[string]string{"ref": ref},
),
Key: 's',
DisabledReason: disabledReason,
OnPress: func() error {
@ -263,7 +265,9 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
},
},
{
Label: self.c.Tr.InteractiveRebase,
Label: utils.ResolvePlaceholderString(self.c.Tr.InteractiveRebase,
map[string]string{"ref": ref},
),
Key: 'i',
DisabledReason: disabledReason,
Tooltip: self.c.Tr.InteractiveRebaseTooltip,
@ -293,7 +297,6 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
self.c.Tr.RebasingTitle),
map[string]string{
"checkedOutBranch": checkedOutBranch,
"ref": ref,
},
)

8
pkg/i18n/english.go
View File

@ -1253,10 +1253,10 @@ func EnglishTranslationSet() TranslationSet {
KeybindingsMenuSectionLocal: "Local",
KeybindingsMenuSectionGlobal: "Global",
KeybindingsMenuSectionNavigation: "Navigation",
RebasingTitle: "Rebase '{{.checkedOutBranch}}' onto '{{.ref}}'",
RebasingFromBaseCommitTitle: "Rebase '{{.checkedOutBranch}}' from marked base onto '{{.ref}}'",
SimpleRebase: "Simple rebase",
InteractiveRebase: "Interactive rebase",
RebasingTitle: "Rebase '{{.checkedOutBranch}}'",
RebasingFromBaseCommitTitle: "Rebase '{{.checkedOutBranch}}' from marked base",
SimpleRebase: "Simple rebase onto '{{.ref}}'",
InteractiveRebase: "Interactive rebase onto '{{.ref}}'",
InteractiveRebaseTooltip: "Begin an interactive rebase with a break at the start, so you can update the TODO commits before continuing.",
MustSelectTodoCommits: "When rebasing, this action only works on a selection of TODO commits.",
ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",

8
pkg/i18n/polish.go
View File

@ -274,10 +274,10 @@ func polishTranslationSet() TranslationSet {
KeybindingsMenuSectionLocal: "Lokalne",
KeybindingsMenuSectionGlobal: "Globalne",
KeybindingsMenuSectionNavigation: "Nawigacja",
RebasingTitle: "Rebase '{{.checkedOutBranch}}' na '{{.ref}}'",
RebasingFromBaseCommitTitle: "Rebase '{{.checkedOutBranch}}' od oznaczonego commita bazowego na '{{.ref}}'",
SimpleRebase: "Prosty rebase",
InteractiveRebase: "Interaktywny rebase",
RebasingTitle: "Rebase '{{.checkedOutBranch}}'",
RebasingFromBaseCommitTitle: "Rebase '{{.checkedOutBranch}}' od oznaczonego commita bazowego",
SimpleRebase: "Prosty rebase na '{{.ref}}'",
InteractiveRebase: "Interaktywny rebase na '{{.ref}}'",
InteractiveRebaseTooltip: "Rozpocznij interaktywny rebase z przerwaniem na początku, abyś mógł zaktualizować commity TODO przed kontynuacją.",
MustSelectTodoCommits: "Podczas rebase ta akcja działa tylko na zaznaczonych commitach TODO.",
ConfirmMerge: "Czy na pewno chcesz scalić '{{.selectedBranch}}' z '{{.checkedOutBranch}}'?",

6
pkg/i18n/russian.go
View File

@ -226,9 +226,9 @@ func RussianTranslationSet() TranslationSet {
ConflictsResolved: "Все конфликты слияния разрешены. Продолжить?",
Continue: "Продолжить",
Keybindings: "Связки клавиш",
RebasingTitle: "Перебазировать '{{.checkedOutBranch}}' на '{{.ref}}'",
SimpleRebase: "Простая перебазировка",
InteractiveRebase: "Интерактивная перебазировка",
RebasingTitle: "Перебазировать '{{.checkedOutBranch}}'",
SimpleRebase: "Простая перебазировка на '{{.ref}}'",
InteractiveRebase: "Интерактивная перебазировка на '{{.ref}}'",
InteractiveRebaseTooltip: "Начать интерактивную перебазировку с перерыва в начале, чтобы можно было обновить TODO коммиты, прежде чем продолжить.",
ConfirmMerge: "Вы уверены, что хотите to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
FwdNoUpstream: "Невозможно перемотать ветку без upstream-ветки",

6
pkg/i18n/traditional_chinese.go
View File

@ -256,9 +256,9 @@ func traditionalChineseTranslationSet() TranslationSet {
ConflictsResolved: "所有合併衝突都已解決。是否繼續？",
Continue: "確認",
Keybindings: "鍵盤快捷鍵",
RebasingTitle: "將 '{{.checkedOutBranch}}' 變基至 '{{.ref}}'",
SimpleRebase: "簡單變基",
InteractiveRebase: "互動變基",
RebasingTitle: "將 '{{.checkedOutBranch}}'",
SimpleRebase: "簡單變基 變基至 '{{.ref}}'",
InteractiveRebase: "互動變基 變基至 '{{.ref}}'",
InteractiveRebaseTooltip: "開始一個互動變基，以中斷開始，這樣你可以在繼續之前更新TODO提交",
ConfirmMerge: "是否將 '{{.selectedBranch}}' 合併至 '{{.checkedOutBranch}}' ？",
FwdNoUpstream: "無法快進無上游分支",

2
pkg/integration/tests/branch/rebase.go
View File

@ -31,7 +31,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Title(Equals("Rebase 'first-change-branch'")).
Select(Contains("Simple rebase")).
Confirm()

2
pkg/integration/tests/branch/rebase_abort_on_conflict.go
View File

@ -31,7 +31,7 @@ var RebaseAbortOnConflict = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Title(Equals("Rebase 'first-change-branch'")).
Select(Contains("Simple rebase")).
Confirm()

2
pkg/integration/tests/branch/rebase_and_drop.go
View File

@ -37,7 +37,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Title(Equals("Rebase 'first-change-branch'")).
Select(Contains("Simple rebase")).
Confirm()

2
pkg/integration/tests/branch/rebase_cancel_on_conflict.go
View File

@ -31,7 +31,7 @@ var RebaseCancelOnConflict = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Title(Equals("Rebase 'first-change-branch'")).
Select(Contains("Simple rebase")).
Confirm()

2
pkg/integration/tests/branch/rebase_copied_branch.go
View File

@ -42,7 +42,7 @@ var RebaseCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Rebase 'branch2' onto 'master'")).
Title(Equals("Rebase 'branch2'")).
Select(Contains("Simple rebase")).
Confirm()
})

2
pkg/integration/tests/branch/rebase_does_not_autosquash.go
View File

@ -40,7 +40,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals("Rebase 'my-branch' onto 'master'")).
Title(Equals("Rebase 'my-branch'")).
Select(Contains("Simple rebase")).
Confirm()

2
pkg/integration/tests/branch/rebase_from_marked_base.go
View File

@ -61,7 +61,7 @@ var RebaseFromMarkedBase = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals("Rebase 'active-branch' from marked base onto 'target-branch'")).
Title(Equals("Rebase 'active-branch' from marked base")).
Select(Contains("Simple rebase")).
Confirm()

2
pkg/integration/tests/branch/rebase_to_upstream.go
View File

@ -67,7 +67,7 @@ var RebaseToUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Select(Contains("Rebase checked-out branch onto origin/master...")).
Confirm()
t.ExpectPopup().Menu().
Title(Equals("Rebase 'target' onto 'origin/master'")).
Title(Equals("Rebase 'target'")).
Select(Contains("Simple rebase")).
Confirm()
})

2
pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go
View File

@ -39,7 +39,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch)
t.ExpectPopup().Menu().
Title(Equals(fmt.Sprintf("Rebase '%s' onto '%s'", TOP_BRANCH, BASE_BRANCH))).
Title(Equals(fmt.Sprintf("Rebase '%s'", TOP_BRANCH))).
Select(Contains("Interactive rebase")).
Confirm()
t.Views().Commits().