sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

use lowercase text for menu items (as we're still yet to standardise on 'Sentence case')

Browse Source
This commit is contained in:
Jesse Duffield
2023-04-15 17:25:58 +10:00
parent b82b6a2992
commit 8f1f712841
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/i18n/english.go
View File

@ -880,8 +880,8 @@ func EnglishTranslationSet() TranslationSet {
GlobalTitle: "Global Keybindings", GlobalTitle: "Global Keybindings",
ConflictsResolved: "all merge conflicts resolved. Continue?", ConflictsResolved: "all merge conflicts resolved. Continue?",
RebasingTitle: "Rebase '{{.checkedOutBranch}}' onto '{{.ref}}'", RebasingTitle: "Rebase '{{.checkedOutBranch}}' onto '{{.ref}}'",
SimpleRebase: "Simple rebase", SimpleRebase: "simple rebase",
InteractiveRebase: "Interactive rebase", InteractiveRebase: "interactive rebase",
InteractiveRebaseTooltip: "Begin an interactive rebase with a break at the start, so you can update the TODO commits before continuing", InteractiveRebaseTooltip: "Begin an interactive rebase with a break at the start, so you can update the TODO commits before continuing",
ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
FwdNoUpstream: "Cannot fast-forward a branch with no upstream", FwdNoUpstream: "Cannot fast-forward a branch with no upstream",

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

@ -32,7 +32,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu(). t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")). Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Select(Contains("Simple rebase")). Select(Contains("simple rebase")).
Confirm() Confirm()
t.Common().AcknowledgeConflicts() t.Common().AcknowledgeConflicts()

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

@ -38,7 +38,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu(). t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")). Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Select(Contains("Simple rebase")). Select(Contains("simple rebase")).
Confirm() Confirm()
t.Views().Information().Content(Contains("rebasing")) t.Views().Information().Content(Contains("rebasing"))

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

@ -41,7 +41,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu(). t.ExpectPopup().Menu().
Title(Equals("Rebase 'my-branch' onto 'master'")). Title(Equals("Rebase 'my-branch' onto 'master'")).
Select(Contains("Simple rebase")). Select(Contains("simple rebase")).
Confirm() Confirm()
t.Views().Commits().Lines( t.Views().Commits().Lines(

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

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