diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go index 2e88b2afd9..f42bc59cbb 100644 --- a/build/lint-locale-usage/lint-locale-usage.go +++ b/build/lint-locale-usage/lint-locale-usage.go @@ -221,10 +221,9 @@ func (omh OnMsgidHandler) HandleTemplateFile(fname string, src any) error { Kind: "Template parser", Err: err, } - } else { - omh.handleTemplateFileNodes(fset, tmplParsed.Tree.Root.Nodes) - return nil } + omh.handleTemplateFileNodes(fset, tmplParsed.Tree.Root.Nodes) + return nil } // This command assumes that we get started from the project root directory @@ -240,11 +239,12 @@ func (omh OnMsgidHandler) HandleTemplateFile(fname string, src any) error { // 2 unable to parse locale ini/json files // 3 unable to parse go or text/template files // 4 found missing message IDs +// +//nolint:forbidigo func main() { allowMissingMsgids := false - for _, arg := range os.Args { - switch arg { - case "--allow-missing-msgids": + for _, arg := range os.Args[1:] { + if arg == "--allow-missing-msgids" { allowMissingMsgids = true } } diff --git a/build/lint-locale-usage/lint-locale-usage_test.go b/build/lint-locale-usage/lint-locale-usage_test.go index 1219545a3e..3b3b746053 100644 --- a/build/lint-locale-usage/lint-locale-usage_test.go +++ b/build/lint-locale-usage/lint-locale-usage_test.go @@ -32,13 +32,13 @@ func HandleTemplateFileWrapped(t *testing.T, fname, src string) []string { func TestUsagesParser(t *testing.T) { t.Run("go, simple", func(t *testing.T) { assert.EqualValues(t, - HandleGoFileWrapped(t, "", "package main\nfunc Render(ctx *context.Context) string { return ctx.Tr(\"what.an.example\"); }\n"), - []string{"what.an.example"}) + []string{"what.an.example"}, + HandleGoFileWrapped(t, "", "package main\nfunc Render(ctx *context.Context) string { return ctx.Tr(\"what.an.example\"); }\n")) }) t.Run("template, simple", func(t *testing.T) { assert.EqualValues(t, - HandleTemplateFileWrapped(t, "", "{{ ctx.Locale.Tr \"what.an.example\" }}\n"), - []string{"what.an.example"}) + []string{"what.an.example"}, + HandleTemplateFileWrapped(t, "", "{{ ctx.Locale.Tr \"what.an.example\" }}\n")) }) }