diff --git a/pkg/constants/links.go b/pkg/constants/links.go index 695b24d38..ca6157fe4 100644 --- a/pkg/constants/links.go +++ b/pkg/constants/links.go @@ -12,18 +12,16 @@ type Docs struct { } var Links = struct { - Docs Docs - Issues string - Donate string - Discussions string - RepoUrl string - Releases string + Docs Docs + Issues string + Donate string + RepoUrl string + Releases string }{ - RepoUrl: "https://github.com/jesseduffield/lazygit", - Issues: "https://github.com/jesseduffield/lazygit/issues", - Donate: "https://github.com/sponsors/jesseduffield", - Discussions: "https://github.com/jesseduffield/lazygit/discussions", - Releases: "https://github.com/jesseduffield/lazygit/releases", + RepoUrl: "https://github.com/jesseduffield/lazygit", + Issues: "https://github.com/jesseduffield/lazygit/issues", + Donate: "https://github.com/sponsors/jesseduffield", + Releases: "https://github.com/jesseduffield/lazygit/releases", Docs: Docs{ CustomDiffRenderers: "https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md", CustomKeybindings: "https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md", diff --git a/pkg/gui/controllers/helpers/window_arrangement_helper.go b/pkg/gui/controllers/helpers/window_arrangement_helper.go index 7428d17e3..e53dd68ec 100644 --- a/pkg/gui/controllers/helpers/window_arrangement_helper.go +++ b/pkg/gui/controllers/helpers/window_arrangement_helper.go @@ -66,8 +66,8 @@ type WindowArrangementArgs struct { // The content shown on the bottom left of the screen when showing a loader // or toast e.g. 'Rebasing /' AppStatus string - // The content shown on the bottom right of the screen (e.g. the 'donate', - // 'ask question' links or a message about the current mode e.g. rebase mode) + // The content shown on the bottom right of the screen (e.g. the version + // number or a message about the current mode e.g. rebase mode) InformationStr string // Whether to show the extras window which contains the command log context ShowExtrasWindow bool diff --git a/pkg/gui/information_panel.go b/pkg/gui/information_panel.go index 76001ecea..a5977336a 100644 --- a/pkg/gui/information_panel.go +++ b/pkg/gui/information_panel.go @@ -1,10 +1,6 @@ package gui import ( - "fmt" - - "github.com/jesseduffield/lazygit/pkg/constants" - "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -13,12 +9,6 @@ func (gui *Gui) informationStr() string { return activeMode.InfoLabel() } - if gui.g.Mouse { - donate := style.FgMagenta.Sprint(style.PrintHyperlink(gui.c.Tr.Donate, constants.Links.Donate)) - askQuestion := style.FgYellow.Sprint(style.PrintHyperlink(gui.c.Tr.AskQuestion, constants.Links.Discussions)) - return fmt.Sprintf("%s %s %s", donate, askQuestion, gui.Config.GetVersion()) - } - return gui.Config.GetVersion() } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index d8aad8b99..8a992ed2f 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -434,8 +434,6 @@ type TranslationSet struct { SureCherryPick string CherryPick string CannotCherryPickNonCommit string - Donate string - AskQuestion string PrevHunk string NextHunk string PrevFileInDiff string @@ -1222,7 +1220,7 @@ type Actions struct { } const englishIntroPopupMessage = ` -Thanks for using lazygit! Seriously you rock. Three things to share with you: +Thanks for using lazygit! Seriously you rock. Two things to share with you: 1) If you want to learn about lazygit's features, watch this vid: https://youtu.be/CPLdltN7wgE @@ -1230,10 +1228,6 @@ Thanks for using lazygit! Seriously you rock. Three things to share with you: 2) Be sure to read the latest release notes at: https://github.com/jesseduffield/lazygit/releases - 3) If lazygit has made your life easier, you can say thanks by clicking the - donate button at the bottom right. Donation does not grant priority support, - but it is much appreciated. - Press {{confirmationKey}} to get started. ` @@ -1674,8 +1668,6 @@ func EnglishTranslationSet() *TranslationSet { SureCherryPick: "Are you sure you want to cherry-pick the {{.numCommits}} copied commit(s) onto this branch?", CherryPick: "Cherry-pick", CannotCherryPickNonCommit: "Cannot cherry-pick this kind of todo item", - Donate: "Donate", - AskQuestion: "Ask Question", PrevHunk: "Go to previous hunk", NextHunk: "Go to next hunk", PrevFileInDiff: "Go to previous file", diff --git a/pkg/integration/tests/ui/accordion.go b/pkg/integration/tests/ui/accordion.go index 0a18d2881..109e11e3c 100644 --- a/pkg/integration/tests/ui/accordion.go +++ b/pkg/integration/tests/ui/accordion.go @@ -16,7 +16,7 @@ import ( // │a35c687d CI commit-10 ▼┌─Command log────────────────────────────────────────────────────┐ // └───────────────────────10 of 20─┘│Random tip: To filter commits by path, press '' │ // ╶─Stash───────────────────0 of 0─╴└────────────────────────────────────────────────────────────────┘ -// /: Scroll, : Cancel, q: Quit, ?: Keybindings, 1-Donate Ask Question unversioned +// Squash: s | Fixup: f | Reword: r | Drop: d | Edit: e | Amend: A | Checkout: | … unversioned var Accordion = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Verify accordion mode kicks in when the screen height is too small",