mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
Use sentence case everywhere
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE. Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything is in 'Sentence case' there's no need for the distinction. I've got a couple lower case things I've kept: namely, things that show up in parentheses.
This commit is contained in:
@ -85,7 +85,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
SelectedLine(Contains(file.status + " " + file.label)).
|
||||
Press(keys.Universal.Remove)
|
||||
|
||||
t.ExpectPopup().Menu().Title(Equals(file.menuTitle)).Select(Contains("discard all changes")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals(file.menuTitle)).Select(Contains("Discard all changes")).Confirm()
|
||||
}
|
||||
}
|
||||
|
||||
@ -100,8 +100,8 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
})
|
||||
|
||||
t.ExpectPopup().Confirmation().
|
||||
Title(Equals("continue")).
|
||||
Content(Contains("all merge conflicts resolved. Continue?")).
|
||||
Title(Equals("Continue")).
|
||||
Content(Contains("All merge conflicts resolved. Continue?")).
|
||||
Cancel()
|
||||
|
||||
discardOneByOne([]statusFile{
|
||||
|
@ -37,7 +37,7 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
).
|
||||
Press(keys.Files.ViewResetOptions)
|
||||
|
||||
t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("discard staged changes")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("Discard staged changes")).Confirm()
|
||||
|
||||
// staged file has been removed
|
||||
t.Views().Files().
|
||||
|
@ -27,14 +27,14 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Press(keys.Files.IgnoreFile).
|
||||
// ensure we can't exclude the .gitignore file
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
|
||||
|
||||
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm()
|
||||
}).
|
||||
Press(keys.Files.IgnoreFile).
|
||||
// ensure we can't ignore the .gitignore file
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .gitignore")).Confirm()
|
||||
|
||||
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm()
|
||||
|
||||
@ -45,7 +45,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Press(keys.Files.IgnoreFile).
|
||||
// exclude a file
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
|
||||
|
||||
t.FileSystem().FileContent(".gitignore", Equals(""))
|
||||
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
||||
@ -54,7 +54,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Press(keys.Files.IgnoreFile).
|
||||
// ignore a file
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .gitignore")).Confirm()
|
||||
|
||||
t.FileSystem().FileContent(".gitignore", Equals("toIgnore\n"))
|
||||
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
||||
|
@ -42,7 +42,7 @@ var RememberCommitMessageAfterFail = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
}).
|
||||
Press(keys.Universal.Remove). // remove file that triggers pre-commit hook to fail
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Menu().Title(Equals("bad")).Select(Contains("discard all changes")).Confirm()
|
||||
t.ExpectPopup().Menu().Title(Equals("bad")).Select(Contains("Discard all changes")).Confirm()
|
||||
}).
|
||||
Lines(
|
||||
Contains("one"),
|
||||
|
Reference in New Issue
Block a user