Skip to content

Commit 64c3507

Browse files
Fix incorrectly wrapped strings by localization routines (#414)
This commit fixes #413. Additionally, nonf variants of functions in output pkg have been added so that string returned by localization routine is printed as is and no further format specifier substitution can take place.
1 parent eb1d36a commit 64c3507

31 files changed

+1370
-786
lines changed

cmd/modern/root/config/add-context.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (c *AddContext) run() {
6969
}
7070

7171
if c.endpointName == "" || !config.EndpointExists(c.endpointName) {
72-
output.FatalfWithHintExamples([][]string{
72+
output.FatalWithHintExamples([][]string{
7373
{localizer.Sprintf("View existing endpoints to choose from"), "sqlcmd config get-endpoints"},
7474
{localizer.Sprintf("Add a new local endpoint"), "sqlcmd create"},
7575
{localizer.Sprintf("Add an already existing endpoint"), "sqlcmd config add-endpoint --address localhost --port 1433"}},
@@ -78,7 +78,7 @@ func (c *AddContext) run() {
7878

7979
if c.userName != "" {
8080
if !config.UserNameExists(c.userName) {
81-
output.FatalfWithHintExamples([][]string{
81+
output.FatalWithHintExamples([][]string{
8282
{localizer.Sprintf("View list of users"), "sqlcmd config get-users"},
8383
{localizer.Sprintf("Add the user"), fmt.Sprintf("sqlcmd config add-user --name %v", c.userName)},
8484
{localizer.Sprintf("Add an endpoint"), "sqlcmd create"}},
@@ -88,7 +88,7 @@ func (c *AddContext) run() {
8888

8989
context.Name = config.AddContext(context)
9090
config.SetCurrentContextName(context.Name)
91-
output.InfofWithHintExamples([][]string{
91+
output.InfoWithHintExamples([][]string{
9292
{localizer.Sprintf("Open in Azure Data Studio"), "sqlcmd open ads"},
9393
{localizer.Sprintf("To start interactive query session"), "sqlcmd query"},
9494
{localizer.Sprintf("To run a query"), "sqlcmd query \"SELECT @@version\""},

cmd/modern/root/config/add-endpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (c *AddEndpoint) run() {
7474
}
7575

7676
uniqueEndpointName := config.AddEndpoint(endpoint)
77-
output.InfofWithHintExamples([][]string{
77+
output.InfoWithHintExamples([][]string{
7878
{localizer.Sprintf("Add a context for this endpoint"), fmt.Sprintf("sqlcmd config add-context --endpoint %v", uniqueEndpointName)},
7979
{localizer.Sprintf("View endpoint names"), "sqlcmd config get-endpoints"},
8080
{localizer.Sprintf("View endpoint details"), fmt.Sprintf("sqlcmd config get-endpoints %v", uniqueEndpointName)},

cmd/modern/root/config/add-user.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (c *AddUser) run() {
106106

107107
if c.authType != "basic" &&
108108
c.authType != "other" {
109-
output.FatalfWithHints([]string{localizer.Sprintf("Authentication type must be '%s' or '%s'", localizer.ModernAuthTypeBasic, localizer.ModernAuthTypeOther)},
109+
output.FatalWithHints([]string{localizer.Sprintf("Authentication type must be '%s' or '%s'", localizer.ModernAuthTypeBasic, localizer.ModernAuthTypeOther)},
110110
localizer.Sprintf("Authentication type '' is not valid %v'", c.authType))
111111
}
112112

@@ -136,15 +136,15 @@ func (c *AddUser) run() {
136136
}
137137

138138
if c.username == "" {
139-
output.FatalfWithHintExamples([][]string{
139+
output.FatalWithHintExamples([][]string{
140140
{localizer.Sprintf("Provide a username with the %s flag"),
141141
"sqlcmd config add-user --username sa"},
142142
},
143143
localizer.Sprintf("Username not provided"))
144144
}
145145

146146
if !secret.IsValidEncryptionMethod(c.passwordEncryption) {
147-
output.FatalfWithHints([]string{
147+
output.FatalWithHints([]string{
148148
localizer.Sprintf("Provide a valid encryption method (%s) with the %s flag", secret.EncryptionMethodsForUsage(), localizer.PasswordEncryptFlag)},
149149
localizer.Sprintf("Encryption method '%v' is not valid", c.passwordEncryption))
150150
}
@@ -168,5 +168,5 @@ func (c *AddUser) run() {
168168
}
169169

170170
uniqueUserName := config.AddUser(user)
171-
output.Infof(localizer.Sprintf("User '%v' added", uniqueUserName))
171+
output.Info(localizer.Sprintf("User '%v' added", uniqueUserName))
172172
}

cmd/modern/root/config/connection-strings.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (c *ConnectionStrings) run() {
120120
output.Infof("%-8s %s", k+":", v)
121121
}
122122
} else {
123-
output.Infof(localizer.Sprintf("Connection Strings only supported for %s Auth type", localizer.ModernAuthTypeBasic))
123+
output.Info(localizer.Sprintf("Connection Strings only supported for %s Auth type", localizer.ModernAuthTypeBasic))
124124
}
125125
}
126126

cmd/modern/root/config/delete-context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ func (c *DeleteContext) run() {
7878

7979
config.DeleteContext(c.name)
8080

81-
output.Infof(localizer.Sprintf("Context '%v' deleted", c.name))
81+
output.Info(localizer.Sprintf("Context '%v' deleted", c.name))
8282
} else {
83-
output.FatalfWithHintExamples([][]string{
83+
output.FatalWithHintExamples([][]string{
8484
{localizer.Sprintf("View available contexts"), "sqlcmd config get-contexts"},
8585
},
8686
localizer.Sprintf("Context '%v' does not exist", c.name))

cmd/modern/root/config/delete-endpoint.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ func (c *DeleteEndpoint) run() {
5454
if config.EndpointExists(c.name) {
5555
config.DeleteEndpoint(c.name)
5656
} else {
57-
output.FatalfWithHintExamples([][]string{
57+
output.FatalWithHintExamples([][]string{
5858
{localizer.Sprintf("View endpoints"), "sqlcmd config get-endpoints"},
5959
},
6060
localizer.Sprintf("Endpoint '%v' does not exist", c.name))
6161
}
6262

63-
output.Infof(localizer.Sprintf("Endpoint '%v' deleted", c.name))
63+
output.Info(localizer.Sprintf("Endpoint '%v' deleted", c.name))
6464
}

cmd/modern/root/config/delete-user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func (c *DeleteUser) run() {
5151
if config.UserNameExists(c.name) {
5252
config.DeleteUser(c.name)
5353
} else {
54-
output.FatalfWithHintExamples([][]string{
54+
output.FatalWithHintExamples([][]string{
5555
{localizer.Sprintf("View users"), "sqlcmd config get-users"},
5656
},
5757
localizer.Sprintf("User %q does not exist", c.name))
5858
}
5959

60-
output.Infof(localizer.Sprintf("User %q deleted", c.name))
60+
output.Info(localizer.Sprintf("User %q deleted", c.name))
6161
}

cmd/modern/root/config/get-contexts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (c *GetContexts) run() {
6161
context := config.GetContext(c.name)
6262
output.Struct(context)
6363
} else {
64-
output.FatalfWithHints(
64+
output.FatalWithHints(
6565
[]string{localizer.Sprintf("To view available contexts run `%s`", localizer.GetContextCommand)},
6666
localizer.Sprintf("error: no context exists with the name: \"%v\"", c.name))
6767
}

cmd/modern/root/config/get-endpoints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (c *GetEndpoints) run() {
5757
context := config.GetEndpoint(c.name)
5858
output.Struct(context)
5959
} else {
60-
output.FatalfWithHints(
60+
output.FatalWithHints(
6161
[]string{localizer.Sprintf("To view available endpoints run `%s`", localizer.GetEndpointsCommand)},
6262
localizer.Sprintf("error: no endpoint exists with the name: \"%v\"", c.name))
6363
}

cmd/modern/root/config/get-users.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (c *GetUsers) run() {
6161
user := config.GetUser(c.name)
6262
output.Struct(user)
6363
} else {
64-
output.FatalfWithHints(
64+
output.FatalWithHints(
6565
[]string{localizer.Sprintf("To view available users run `%s`", localizer.GetUsersCommand)},
6666
localizer.Sprintf("error: no user exists with the name: \"%v\"", c.name))
6767
}

0 commit comments

Comments
 (0)