summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Bast <rob.bast@gmail.com>2018-08-21 12:06:42 +0200
committerRob Bast <rob.bast@gmail.com>2018-08-21 12:06:42 +0200
commit5f6b61d28c86676fec311ec94edad977343e48bd (patch)
tree19ef45ad75307bb40bd2c023629ca470d2feacca
parent810540edfad0736a294efede7664038134f5b5a0 (diff)
adjust translation(s) for forced branch deletion
-rw-r--r--pkg/gui/branches_panel.go7
-rw-r--r--pkg/i18n/dutch.go5
-rw-r--r--pkg/i18n/english.go5
3 files changed, 14 insertions, 3 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index e0b947f13..9d4f467bf 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -76,8 +76,13 @@ func (gui *Gui) deleteBranch(g *gocui.Gui, v *gocui.View, force bool) error {
return gui.createErrorPanel(g, gui.Tr.SLocalize("CantDeleteCheckOutBranch"))
}
title := gui.Tr.SLocalize("DeleteBranch")
+ if force {
+ messageId := "ForceDeleteBranchMessage"
+ } else {
+ messageId := "DeleteBranchMessage"
+ }
message := gui.Tr.TemplateLocalize(
- "DeleteBranchMessage",
+ messageId,
Teml{
"selectedBranchName": selectedBranch.Name,
},
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index a02c7c4bc..a5bf897b5 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -132,7 +132,10 @@ func addDutch(i18nObject *i18n.Bundle) error {
Other: "Verwijder branch",
}, &i18n.Message{
ID: "DeleteBranchMessage",
- Other: "Weet je zeker dat je {{.selectedBranchName}} branch wil verwijderen?",
+ Other: "Weet je zeker dat je branch {{.selectedBranchName}} wil verwijderen?",
+ }, &i18n.Message{
+ ID: "DeleteBranchMessage",
+ Other: "Weet je zeker dat je branch {{.selectedBranchName}} geforceerd wil verwijderen?",
}, &i18n.Message{
ID: "CantMergeBranchIntoItself",
Other: "Je kan niet een branch in zichzelf mergen",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index db51fcdc4..55f6c5bc3 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -140,7 +140,10 @@ func addEnglish(i18nObject *i18n.Bundle) error {
Other: "Delete Branch",
}, &i18n.Message{
ID: "DeleteBranchMessage",
- Other: "Are you sure you want delete the branch {{.selectedBranchName}} ?",
+ Other: "Are you sure you want to delete the branch {{.selectedBranchName}} ?",
+ }, &i18n.Message{
+ ID: "ForceDeleteBranchMessage",
+ Other: "Are you sure you want to force delete the branch {{.selectedBranchName}} ?",
}, &i18n.Message{
ID: "CantMergeBranchIntoItself",
Other: "You cannot merge a branch into itself",