summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-08-23 10:19:31 +1000
committerGitHub <noreply@github.com>2018-08-23 10:19:31 +1000
commit2cdd439286c8cd1bf9afa6ea1b0d9a2e8502b690 (patch)
treeffd82db5d7d9da865099006ef17732de92797eb0 /pkg
parent584d6b241cc1d4cacb8bda45babbfd148725dee4 (diff)
parent2680b2f4fe600429f9fb59a74361748716b5c027 (diff)
Merge pull request #204 from remyabel/hotfix/fix-dutch-errors
Fix typos causing tests to fail
Diffstat (limited to 'pkg')
-rw-r--r--pkg/i18n/dutch.go2
-rw-r--r--pkg/i18n/english.go4
-rw-r--r--pkg/i18n/i18n_test.go4
3 files changed, 5 insertions, 5 deletions
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index a5bf897b5..68e7c82bd 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -134,7 +134,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "DeleteBranchMessage",
Other: "Weet je zeker dat je branch {{.selectedBranchName}} wil verwijderen?",
}, &i18n.Message{
- ID: "DeleteBranchMessage",
+ ID: "ForceDeleteBranchMessage",
Other: "Weet je zeker dat je branch {{.selectedBranchName}} geforceerd wil verwijderen?",
}, &i18n.Message{
ID: "CantMergeBranchIntoItself",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 2269ffb9f..38fbac4cb 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -140,10 +140,10 @@ func addEnglish(i18nObject *i18n.Bundle) error {
Other: "Delete Branch",
}, &i18n.Message{
ID: "DeleteBranchMessage",
- Other: "Are you sure you want to 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}} ?",
+ Other: "Are you sure you want to force delete the branch {{.selectedBranchName}}?",
}, &i18n.Message{
ID: "CantMergeBranchIntoItself",
Other: "You cannot merge a branch into itself",
diff --git a/pkg/i18n/i18n_test.go b/pkg/i18n/i18n_test.go
index 481a40863..5c2ca6419 100644
--- a/pkg/i18n/i18n_test.go
+++ b/pkg/i18n/i18n_test.go
@@ -57,7 +57,7 @@ func TestLocalizer(t *testing.T) {
},
}))
assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
- assert.Equal(t, "Are you sure you want delete the branch test ?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+ assert.Equal(t, "Are you sure you want to delete the branch test?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
},
},
{
@@ -70,7 +70,7 @@ func TestLocalizer(t *testing.T) {
},
}))
assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
- assert.Equal(t, "Weet je zeker dat je test branch wil verwijderen?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+ assert.Equal(t, "Weet je zeker dat je branch test wil verwijderen?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
},
},
}