From 29c5bd9def46a835a2d19988c861402cb54d0f1c Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 22 Feb 2016 19:12:35 -0500 Subject: Fixing localization error in commands --- mattermost.go | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'mattermost.go') diff --git a/mattermost.go b/mattermost.go index 5a18e2f40..ca7d43df7 100644 --- a/mattermost.go +++ b/mattermost.go @@ -276,9 +276,7 @@ func cmdCreateTeam() { os.Exit(1) } - c := &api.Context{} - c.RequestId = model.NewId() - c.IpAddress = "cmd_line" + c := getMockContext() team := &model.Team{} team.DisplayName = flagTeamName @@ -377,9 +375,7 @@ func cmdAssignRole() { os.Exit(1) } - c := &api.Context{} - c.RequestId = model.NewId() - c.IpAddress = "cmd_line" + c := getMockContext() var team *model.Team if result := <-api.Srv.Store.Team().GetByName(flagTeamName); result.Err != nil { @@ -431,10 +427,6 @@ func cmdResetPassword() { os.Exit(1) } - c := &api.Context{} - c.RequestId = model.NewId() - c.IpAddress = "cmd_line" - var team *model.Team if result := <-api.Srv.Store.Team().GetByName(flagTeamName); result.Err != nil { l4g.Error("%v", result.Err) @@ -474,9 +466,7 @@ func cmdPermDeleteUser() { os.Exit(1) } - c := &api.Context{} - c.RequestId = model.NewId() - c.IpAddress = "cmd_line" + c := getMockContext() var team *model.Team if result := <-api.Srv.Store.Team().GetByName(flagTeamName); result.Err != nil { @@ -525,9 +515,7 @@ func cmdPermDeleteTeam() { os.Exit(1) } - c := &api.Context{} - c.RequestId = model.NewId() - c.IpAddress = "cmd_line" + c := getMockContext() var team *model.Team if result := <-api.Srv.Store.Team().GetByName(flagTeamName); result.Err != nil { @@ -566,6 +554,15 @@ func flushLogAndExit(code int) { os.Exit(code) } +func getMockContext() *api.Context { + c := &api.Context{} + c.RequestId = model.NewId() + c.IpAddress = "cmd_line" + c.T = utils.TfuncWithFallback(model.DEFAULT_LOCALE) + c.Locale = model.DEFAULT_LOCALE + return c +} + var usage = `Mattermost commands to help configure the system NAME: -- cgit v1.2.3-1-g7c22