diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-15 17:25:58 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-15 17:29:31 +1000 |
| commit | 8f1f7128417169eb2f3692a49a06996980130c97 (patch) | |
| tree | 4658af93c3c497b661271e3d8fed2e553210e621 | |
| parent | b82b6a2992b56f8cacc9e9ec9a886e6af51ce99e (diff) | |
use lowercase text for menu items (as we're still yet to standardise on 'Sentence case')
| -rw-r--r-- | pkg/i18n/english.go | 4 | ||||
| -rw-r--r-- | pkg/integration/tests/branch/rebase.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/branch/rebase_and_drop.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/branch/rebase_does_not_autosquash.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b8cbc46b1..4d384da71 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -880,8 +880,8 @@ func EnglishTranslationSet() TranslationSet { GlobalTitle: "Global Keybindings", ConflictsResolved: "all merge conflicts resolved. Continue?", RebasingTitle: "Rebase '{{.checkedOutBranch}}' onto '{{.ref}}'", - SimpleRebase: "Simple rebase", - InteractiveRebase: "Interactive rebase", + SimpleRebase: "simple rebase", + InteractiveRebase: "interactive rebase", 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}}'?", FwdNoUpstream: "Cannot fast-forward a branch with no upstream", diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index f2c0e3287..c34e73c2d 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -32,7 +32,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")). - Select(Contains("Simple rebase")). + Select(Contains("simple rebase")). Confirm() t.Common().AcknowledgeConflicts() diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index c1fc6ab2f..8a1ade2fe 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -38,7 +38,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")). - Select(Contains("Simple rebase")). + Select(Contains("simple rebase")). Confirm() t.Views().Information().Content(Contains("rebasing")) diff --git a/pkg/integration/tests/branch/rebase_does_not_autosquash.go b/pkg/integration/tests/branch/rebase_does_not_autosquash.go index 4465bc93b..2638bec7b 100644 --- a/pkg/integration/tests/branch/rebase_does_not_autosquash.go +++ b/pkg/integration/tests/branch/rebase_does_not_autosquash.go @@ -41,7 +41,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Rebase 'my-branch' onto 'master'")). - Select(Contains("Simple rebase")). + Select(Contains("simple rebase")). Confirm() t.Views().Commits().Lines( diff --git a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go index e4788973c..ba0055276 100644 --- a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go @@ -40,7 +40,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals(fmt.Sprintf("Rebase '%s' onto '%s'", TOP_BRANCH, BASE_BRANCH))). - Select(Contains("Interactive rebase")). + Select(Contains("interactive rebase")). Confirm() t.Views().Commits(). |