fix(i18n): lint, review and clean up a little

spf13 · Apr 5, 2023 · 95001ae · 95001ae
1 parent b279579
commit 95001ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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() {