first pass at updating go-i18n library

Author: allmightyspiff

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/Xuanwo/go-locale v1.1.0
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
 	github.com/miekg/dns v1.1.58
-	github.com/nicksnyder/go-i18n v1.10.3
+	github.com/nicksnyder/go-i18n/v2 v2.4.0
 	github.com/onsi/ginkgo/v2 v2.17.0
 	github.com/onsi/gomega v1.31.1
 	github.com/softlayer/softlayer-go v1.1.3
@@ -36,8 +36,6 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/softlayer/xmlrpc v0.0.0-20200409220501-5f089df7cb7e // indirect

go.sum

@@ -52,17 +52,12 @@ github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 h1:NicmruxkeqHjDv03SfSxqmaLuisdd
 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1/go.mod h1:eyp4DdUJAKkr9tvxR3jWhw2mDK7CWABMG5r9uyaKC7I=
 github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
 github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
-github.com/nicksnyder/go-i18n v1.10.3 h1:0U60fnLBNrLBVt8vb8Q67yKNs+gykbQuLsIkiesJL+w=
-github.com/nicksnyder/go-i18n v1.10.3/go.mod h1:hvLG5HTlZ4UfSuVLSRuX7JRUomIaoKQM19hm6f+no7o=
 github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
 github.com/onsi/ginkgo/v2 v2.17.0 h1:kdnunFXpBjbzN56hcJHrXZ8M+LOkenKA7NnBzTNigTI=
 github.com/onsi/ginkgo/v2 v2.17.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
 github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
-github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -132,7 +127,6 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

plugin/i18n/i18n.go

@@ -3,11 +3,13 @@ package i18n
 import (
 	"path/filepath"
 	"strings"
-
-	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/bluemix/configuration/core_config"
+	"golang.org/x/text/language"
+	"encoding/json"
+	"fmt"
+	// "github.com/IBM-Cloud/ibm-cloud-cli-sdk/bluemix/configuration/core_config"
 	"github.com/Xuanwo/go-locale"
-	goi18n "github.com/nicksnyder/go-i18n/i18n"
-	"github.ibm.com/SoftLayer/softlayer-cli/plugin/resources"
+	goi18n "github.com/nicksnyder/go-i18n/v2/i18n"
+	// "github.ibm.com/SoftLayer/softlayer-cli/plugin/resources"
 )
 
 const (
@@ -28,6 +30,7 @@ var SUPPORTED_LOCALES = []string{
 }
 
 var resourcePath = filepath.Join("plugin", "i18n", "resources")
+var localizer = Init()
 
 func GetResourcePath() string {
 	return resourcePath
@@ -37,14 +40,34 @@ func SetResourcePath(path string) {
 	resourcePath = path
 }
 
-var T goi18n.TranslateFunc = Init(core_config.NewCoreConfig(func(error) {}))
+// var T goi18n.TranslateFunc = Init(core_config.NewCoreConfig(func(error) {}))
+
+func T(text string, subs ...interface{}) string {
+
+	// fmt.Printf("SUBS: %v\n", subs)
+	message := &goi18n.Message{ID: text, Other: text}
+	config := &goi18n.LocalizeConfig{DefaultMessage: message}
+	l_string, err := localizer.Localize(config)
+	if err != nil {
+		fmt.Printf("ERROR i18n\n")
+		return err.Error()
+	}
+	return l_string
+}
+
+
 
-func Init(coreConfig core_config.Repository) goi18n.TranslateFunc {
-	userLocale := coreConfig.Locale()
-	locale := supportedLocale(userLocale)
-	return initWithLocale(locale)
+
+func Init() *goi18n.Localizer {
+	bundle := goi18n.NewBundle(language.English)
+	bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
+	bundle.MustLoadMessageFile("plugin/i18n/resources/en_US.json")
+	bundle.MustLoadMessageFile("plugin/i18n/resources/ja_JP.json")
+	loc := goi18n.NewLocalizer(bundle, language.English.String())
+	return loc
 }
 
+/*
 func initWithLocale(locale string) goi18n.TranslateFunc {
 	err := loadFromAsset(locale)
 	if err != nil {
@@ -64,6 +87,7 @@ func loadFromAsset(locale string) (err error) {
 	return
 }
 
+*/
 // Tries to determine the system locale, when local isn't set, default to en_US
 func DetectLocal() string {
 	tag, err := locale.Detect()
@@ -75,6 +99,7 @@ func DetectLocal() string {
 	return locale
 }
 
+
 // Tries to match the system locale with a supported locale, otherwise sets a DEFAULT_LOCALE
 func supportedLocale(configLocal string) string {