From b81bac3d6588de046519691f4e1ab77f49bdc6d4 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 27 Jul 2021 20:05:53 +1000 Subject: [PATCH] more i18n --- pkg/gui/pull_request_menu_panel.go | 6 +++--- pkg/i18n/english.go | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/gui/pull_request_menu_panel.go b/pkg/gui/pull_request_menu_panel.go index 7cdd7dcbd..aa7bc481a 100644 --- a/pkg/gui/pull_request_menu_panel.go +++ b/pkg/gui/pull_request_menu_panel.go @@ -18,13 +18,13 @@ func (gui *Gui) createPullRequestMenu(selectedBranch *models.Branch, checkedOutB menuItemsForBranch := func(branch *models.Branch) []*menuItem { return []*menuItem{ { - displayStrings: fromToDisplayStrings(branch.Name, gui.Tr.DefaultBranch), + displayStrings: fromToDisplayStrings(branch.Name, gui.Tr.LcDefaultBranch), onPress: func() error { return gui.createPullRequest(branch.Name, "") }, }, { - displayStrings: fromToDisplayStrings(branch.Name, gui.Tr.SelectBranch), + displayStrings: fromToDisplayStrings(branch.Name, gui.Tr.LcSelectBranch), onPress: func() error { return gui.prompt(promptOpts{ title: branch.Name + " →", @@ -61,7 +61,7 @@ func (gui *Gui) createPullRequest(from string, to string) error { if err != nil { return gui.surfaceError(err) } - gui.OnRunCommand(oscommands.NewCmdLogEntry(fmt.Sprintf("Creating pull request at URL: %s", url), "Create pull request", false)) + gui.OnRunCommand(oscommands.NewCmdLogEntry(fmt.Sprintf(gui.Tr.CreatingPullRequestAtUrl, url), gui.Tr.CreatePullRequest, false)) return nil } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index da49e46ce..e2a9f38de 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -454,12 +454,12 @@ type TranslationSet struct { ToggleWhitespaceInDiffView string IgnoringWhitespaceInDiffView string ShowingWhitespaceInDiffView string - CreatePullRequest string CreatePullRequestOptions string LcCreatePullRequestOptions string - SelectParentCommitForMerge string - DefaultBranch string - SelectBranch string + LcDefaultBranch string + LcSelectBranch string + CreatePullRequest string + CreatingPullRequestAtUrl string Spans Spans } @@ -1010,9 +1010,9 @@ func englishTranslationSet() TranslationSet { CreatePullRequest: "Create pull request", CreatePullRequestOptions: "Create pull request options", LcCreatePullRequestOptions: "create pull request options", - SelectParentCommitForMerge: "Select parent commit for merge", - DefaultBranch: "default branch", - SelectBranch: "select branch", + LcDefaultBranch: "default branch", + LcSelectBranch: "select branch", + CreatingPullRequestAtUrl: "Creating pull request at URL: %s", Spans: Spans{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "Checkout commit",