go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-19 22:33:16 +02:00
Code Issues Releases Activity

better popups

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-15 08:10:56 +10:00
parent ffda2839e0
commit 28cd827cea
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/gui.go
View File

@ -339,7 +339,7 @@ func (gui *Gui) Run() error {
configPopupVersion := gui.Config.GetUserConfig().GetInt("StartupPopupVersion") configPopupVersion := gui.Config.GetUserConfig().GetInt("StartupPopupVersion")
// -1 means we've disabled these popups // -1 means we've disabled these popups
if configPopupVersion != -1 && configPopupVersion < StartupPopupVersion { if configPopupVersion != -1 && configPopupVersion < StartupPopupVersion {
popupTasks = append(popupTasks, gui.showShamelessSelfPromotionMessage) popupTasks = append(popupTasks, gui.showIntroPopupMessage)
} }
gui.showInitialPopups(popupTasks) 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 { onConfirm := func() error {
done <- struct{}{} done <- struct{}{}
return gui.Config.WriteToUserConfig("startupPopupVersion", StartupPopupVersion) return gui.Config.WriteToUserConfig("startupPopupVersion", StartupPopupVersion)
@ -468,8 +468,8 @@ func (gui *Gui) showShamelessSelfPromotionMessage(done chan struct{}) error {
return gui.ask(askOpts{ return gui.ask(askOpts{
returnToView: nil, returnToView: nil,
returnFocusOnClose: true, returnFocusOnClose: true,
title: gui.Tr.SLocalize("ShamelessSelfPromotionTitle"), title: "",
prompt: gui.Tr.SLocalize("ShamelessSelfPromotionMessage"), prompt: gui.Tr.SLocalize("IntroPopupMessage"),
handleConfirm: onConfirm, handleConfirm: onConfirm,
handleClose: onConfirm, handleClose: onConfirm,
}) })

14
pkg/i18n/dutch.go
View File

@ -443,18 +443,14 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "AnonymousReportingPrompt", ID: "AnonymousReportingPrompt",
Other: "Zou je anonieme data rapportage willen aanzetten om lazygit beter te kunnen maken? (enter/esc)", Other: "Zou je anonieme data rapportage willen aanzetten om lazygit beter te kunnen maken? (enter/esc)",
}, &i18n.Message{ }, &i18n.Message{
ID: "ShamelessSelfPromotionTitle", ID: "IntroPopupMessage",
Other: "Schaamteloose zelf promotie", Other: `Bedankt voor het gebruik maken van lazygit! 2 dingen die je moet weten:
}, &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! 1) Als je meer van lazygit zijn features wilt leren bekijk dan deze video:
2) Als je meer van lazygit zijn features wilt leren bekijk dan deze video:
https://youtu.be/CPLdltN7wgE 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{ }, &i18n.Message{
ID: "GitconfigParseErr", 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. `, 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. `,

14
pkg/i18n/english.go
View File

@ -451,18 +451,14 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "AnonymousReportingPrompt", ID: "AnonymousReportingPrompt",
Other: "Would you like to enable anonymous reporting data to help improve lazygit? (enter/esc)", Other: "Would you like to enable anonymous reporting data to help improve lazygit? (enter/esc)",
}, &i18n.Message{ }, &i18n.Message{
ID: "ShamelessSelfPromotionTitle", ID: "IntroPopupMessage",
Other: "Shameless Self Promotion", Other: `Thanks for using lazygit! Two things to share with you:
}, &i18n.Message{
ID: "ShamelessSelfPromotionMessage",
Other: `Thanks for using lazygit! Three things to share with you:
1) lazygit now has basic mouse support! 1) If you want to learn about lazygit's features, watch this vid:
2) If you want to learn about lazygit's features, watch this vid:
https://youtu.be/CPLdltN7wgE 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{ }, &i18n.Message{
ID: "GitconfigParseErr", ID: "GitconfigParseErr",
Other: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`, Other: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`,