From cdb680ac1ebb361171d1684b7bffb41df749c3e5 Mon Sep 17 00:00:00 2001 From: Goutte Date: Wed, 5 Apr 2023 05:55:48 +0200 Subject: [PATCH] fix(i18n): lint, review and clean up a little --- Makefile | 2 ++ localizer.go | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7098c2d8..c44bcb2e 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,10 @@ clean: rm -rf $(BIN) i18n_extract: + $(info ******************** extracting translation files ********************) goi18n extract -outdir translations goi18n merge -outdir translations translations/* i18n_merge: + $(info ******************** merging translation files ********************) goi18n merge -outdir translations translations/* diff --git a/localizer.go b/localizer.go index 3d208583..8f2319a6 100644 --- a/localizer.go +++ b/localizer.go @@ -3,10 +3,11 @@ package cobra import ( "embed" "fmt" + "os" + "github.com/BurntSushi/toml" "github.com/nicksnyder/go-i18n/v2/i18n" "golang.org/x/text/language" - "os" ) var defaultLanguage = language.English @@ -366,10 +367,13 @@ func detectLangs() []string { func appendLang(langs *[]string, lang language.Tag) { langString := lang.String() - langBase, _ := lang.Base() *langs = append(*langs, langString) - *langs = append(*langs, langBase.ISO3()) - *langs = append(*langs, langBase.String()) + + langBase, confidentInBase := lang.Base() + if confidentInBase != language.No { + *langs = append(*langs, langBase.String()) + *langs = append(*langs, langBase.ISO3()) + } } func setupLocalizer() {