diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 08:10:56 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-16 09:07:54 +1000 |
commit | 28cd827cea0ff360e6d989055bfdae835ddfcf30 (patch) | |
tree | 42accc579ecaa3924283f4407cbd713bb4a7a7f6 | |
parent | ffda2839e0337262788556ba6b60ed9a5aef4a46 (diff) |
better popups
-rw-r--r-- | pkg/gui/gui.go | 8 | ||||
-rw-r--r-- | pkg/i18n/dutch.go | 14 | ||||
-rw-r--r-- | pkg/i18n/english.go | 14 |
3 files changed, 14 insertions, 22 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index d8619f75d..a4c99e1c0 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -339,7 +339,7 @@ func (gui *Gui) Run() error { configPopupVersion := gui.Config.GetUserConfig().GetInt("StartupPopupVersion") // -1 means we've disabled these popups if configPopupVersion != -1 && configPopupVersion < StartupPopupVersion { - popupTasks = append(popupTasks, gui.showShamelessSelfPromotionMessage) + popupTasks = append(popupTasks, gui.showIntroPopupMessage) } gui.showInitialPopups(popupTasks) @@ -459,7 +459,7 @@ func (gui *Gui) showInitialPopups(tasks []func(chan struct{}) error) { }() } -func (gui *Gui) showShamelessSelfPromotionMessage(done chan struct{}) error { +func (gui *Gui) showIntroPopupMessage(done chan struct{}) error { onConfirm := func() error { done <- struct{}{} return gui.Config.WriteToUserConfig("startupPopupVersion", StartupPopupVersion) @@ -468,8 +468,8 @@ func (gui *Gui) showShamelessSelfPromotionMessage(done chan struct{}) error { return gui.ask(askOpts{ returnToView: nil, returnFocusOnClose: true, - title: gui.Tr.SLocalize("ShamelessSelfPromotionTitle"), - prompt: gui.Tr.SLocalize("ShamelessSelfPromotionMessage"), + title: "", + prompt: gui.Tr.SLocalize("IntroPopupMessage"), handleConfirm: onConfirm, handleClose: onConfirm, }) diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 47e0838f5..446a6435b 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -443,18 +443,14 @@ func addDutch(i18nObject *i18n.Bundle) error { ID: "AnonymousReportingPrompt", Other: "Zou je anonieme data rapportage willen aanzetten om lazygit beter te kunnen maken? (enter/esc)", }, &i18n.Message{ - ID: "ShamelessSelfPromotionTitle", - Other: "Schaamteloose zelf promotie", - }, &i18n.Message{ - ID: "ShamelessSelfPromotionMessage", - Other: `Bedankt voor het gebruik maken van lazygit! 3 dingen die je moet weten: - -1) lazygit heeft nu basis muis support! + ID: "IntroPopupMessage", + Other: `Bedankt voor het gebruik maken van lazygit! 2 dingen die je moet weten: -2) Als je meer van lazygit zijn features wilt leren bekijk dan deze video: +1) Als je meer van lazygit zijn features wilt leren bekijk dan deze video: https://youtu.be/CPLdltN7wgE -3) Github matched nu elke donations euro voor euro voor de komende 12 maanden, dus als je graag zou willen doneren klik the doneer knop rechts onderin`, +3) Als je git gebruikt, ben je een programmeur! Met jouw hulp kunnen we lazygit verbeteren, dus overweeg om een donateur te worden en mee te doen aan het plezier op + https://github.com/jesseduffield/lazygit`, }, &i18n.Message{ ID: "GitconfigParseErr", Other: `Gogit kon je gitconfig bestand niet goed parsen door de aanwezigheid van losstaande '\' tekens. Het weghalen van deze tekens zou het probleem moeten oplossen. `, diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 5f974dc64..0815eeb73 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -451,18 +451,14 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "AnonymousReportingPrompt", Other: "Would you like to enable anonymous reporting data to help improve lazygit? (enter/esc)", }, &i18n.Message{ - ID: "ShamelessSelfPromotionTitle", - Other: "Shameless Self Promotion", - }, &i18n.Message{ - ID: "ShamelessSelfPromotionMessage", - Other: `Thanks for using lazygit! Three things to share with you: - -1) lazygit now has basic mouse support! + ID: "IntroPopupMessage", + Other: `Thanks for using lazygit! Two things to share with you: -2) If you want to learn about lazygit's features, watch this vid: +1) If you want to learn about lazygit's features, watch this vid: https://youtu.be/CPLdltN7wgE -3) Github are now matching any donations dollar-for-dollar for the next 12 months, so if you've been tossing up over whether to click the donate link in the bottom right corner, now is the time!`, +3) If you're using git, that makes you a programmer! With your help we can make lazygit better, so consider becoming a contributor and joining the fun at + https://github.com/jesseduffield/lazygit`, }, &i18n.Message{ ID: "GitconfigParseErr", Other: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`, |