diff --git a/go.mod b/go.mod index 7ce9b7f..a57f571 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/avfs/avfs v0.33.0 github.com/onsi/ginkgo/v2 v2.20.2 github.com/onsi/gomega v1.34.2 + github.com/snivilised/li18ngo v0.1.7 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 go.uber.org/mock v0.5.0 @@ -24,13 +25,14 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/snivilised/nefilim v0.1.4 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect + golang.org/x/tools v0.26.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -39,9 +41,8 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/nicksnyder/go-i18n/v2 v2.4.1 github.com/samber/lo v1.47.0 - github.com/snivilised/extendio v0.7.0 github.com/spf13/viper v1.19.0 - golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.24.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 ) diff --git a/go.sum b/go.sum index 3c4baf9..9ae047e 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -33,8 +31,6 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/nicksnyder/go-i18n/v2 v2.4.1 h1:zwzjtX4uYyiaU02K5Ia3zSkpJZrByARkRB4V3YPrr0g= github.com/nicksnyder/go-i18n/v2 v2.4.1/go.mod h1:++Pl70FR6Cki7hdzZRnEEqdc2dJt+SAGotyFg/SvZMk= github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= @@ -57,10 +53,10 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/snivilised/extendio v0.7.0 h1:MY6w9qCK5wVEvP2WpMT5ywJwpDJe97WHDGuwrsTLpek= -github.com/snivilised/extendio v0.7.0/go.mod h1:l8MwJOy9ojMQYJrSKRbQS3WfDylevnRtBp/zwAmFEKc= -github.com/snivilised/lorax v0.5.2 h1:iReIJl63tydiPSSD0YzsNQFX1CctmvMkYx0aSxoZJKo= -github.com/snivilised/lorax v0.5.2/go.mod h1:7H1JPgSn4h4p8NSqfl64raacYefdm/FiFkfcZ51PVHY= +github.com/snivilised/li18ngo v0.1.7 h1:XRYpmP7jSAxzRyg5WH0PViFb9ycWGFcDkQQqd2GsjzQ= +github.com/snivilised/li18ngo v0.1.7/go.mod h1:NVOexqt/aIhnenNPQDqbJchLNte92io87j5o2l+HNqs= +github.com/snivilised/nefilim v0.1.4 h1:bhiENDl/T6ZQO146eF8UnxtXLQenSzEyjwuTeWScImw= +github.com/snivilised/nefilim v0.1.4/go.mod h1:+4/hKxgfvE8eNjLMJC+3ropEZSQuiR/NqfPtIuw7ZMw= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= @@ -88,20 +84,16 @@ go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -go.uber.org/zap/exp v0.2.0 h1:FtGenNNeCATRB3CmB/yEUnjEFeJWpB/pMcy7e2bKPYs= -go.uber.org/zap/exp v0.2.0/go.mod h1:t0gqAIdh1MfKv9EwN/dLwfZnJxe9ITAZN78HEWPFWDQ= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/src/assistant/get-third-party-cl_test.go b/src/assistant/get-third-party-cl_test.go index 0e339cc..00e6f8a 100644 --- a/src/assistant/get-third-party-cl_test.go +++ b/src/assistant/get-third-party-cl_test.go @@ -13,7 +13,7 @@ import ( "github.com/snivilised/cobrass/src/clif" "github.com/snivilised/cobrass/src/internal/helpers" "github.com/snivilised/cobrass/src/store" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" ) type baseTE struct { @@ -33,7 +33,7 @@ var _ = Describe("GetThirdPartyCL", Ordered, func() { repo string l10nPath string - from xi18n.LoadFrom + from li18ngo.LoadFrom rootCommand *cobra.Command paramSet *assistant.ParamSet[store.ProfileParameterSet] @@ -44,14 +44,14 @@ var _ = Describe("GetThirdPartyCL", Ordered, func() { repo = helpers.Repo("../..") l10nPath = helpers.Path(repo, "Test/data/l10n") - from = xi18n.LoadFrom{ + from = li18ngo.LoadFrom{ Path: l10nPath, - Sources: xi18n.TranslationFiles{ - locale.CobrassSourceID: xi18n.TranslationSource{Name: "test"}, + Sources: li18ngo.TranslationFiles{ + locale.CobrassSourceID: li18ngo.TranslationSource{Name: "test"}, }, } - if err := xi18n.Use(func(o *xi18n.UseOptions) { + if err := li18ngo.Use(func(o *li18ngo.UseOptions) { o.From = from }); err != nil { Fail(err.Error()) diff --git a/src/assistant/locale/i18n-defs.go b/src/assistant/locale/i18n-defs.go index c41d65d..ae7ae94 100644 --- a/src/assistant/locale/i18n-defs.go +++ b/src/assistant/locale/i18n-defs.go @@ -2,7 +2,7 @@ package locale const CobrassSourceID = "github.com/snivilised/cobrass" -// These definitions are in support of extendio's Localisable +// These definitions are in support of li18ngo's Localisable // interface and other i18n related definitions. type CobrassTemplData struct{} diff --git a/src/assistant/locale/i18n.go b/src/assistant/locale/i18n.go index f7e0f89..beb1e3d 100644 --- a/src/assistant/locale/i18n.go +++ b/src/assistant/locale/i18n.go @@ -1,9 +1,9 @@ package locale import ( - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" ) -func Use(options ...xi18n.UseOptionFn) error { - return xi18n.Use(options...) +func Use(options ...li18ngo.UseOptionFn) error { + return li18ngo.Use(options...) } diff --git a/src/assistant/locale/messages-validation-errors_test.go b/src/assistant/locale/messages-validation-errors_test.go index d2851b8..297e69d 100644 --- a/src/assistant/locale/messages-validation-errors_test.go +++ b/src/assistant/locale/messages-validation-errors_test.go @@ -8,7 +8,7 @@ import ( "github.com/snivilised/cobrass/src/assistant/locale" "github.com/snivilised/cobrass/src/internal/helpers" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" ) type validationEntry struct { @@ -24,21 +24,21 @@ var _ = Describe("MessagesValidationErrors", Ordered, func() { repo string l10nPath string - from xi18n.LoadFrom + from li18ngo.LoadFrom ) BeforeAll(func() { repo = helpers.Repo("../..") l10nPath = helpers.Path(repo, "Test/data/l10n") - from = xi18n.LoadFrom{ + from = li18ngo.LoadFrom{ Path: l10nPath, - Sources: xi18n.TranslationFiles{ - locale.CobrassSourceID: xi18n.TranslationSource{Name: "test"}, + Sources: li18ngo.TranslationFiles{ + locale.CobrassSourceID: li18ngo.TranslationSource{Name: "test"}, }, } - if err := xi18n.Use(func(o *xi18n.UseOptions) { + if err := li18ngo.Use(func(o *li18ngo.UseOptions) { o.From = from }); err != nil { Fail(err.Error()) diff --git a/src/assistant/locale/messages-validation.go b/src/assistant/locale/messages-validation.go index 66d674f..9025ee4 100644 --- a/src/assistant/locale/messages-validation.go +++ b/src/assistant/locale/messages-validation.go @@ -2,7 +2,7 @@ package locale import ( "github.com/nicksnyder/go-i18n/v2/i18n" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" ) // The code for these messages needs to be generated not hand coded. We @@ -43,7 +43,7 @@ type WithinOptValidationBehaviourQuery interface { } type WithinOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e WithinOptValidation) IsOutOfRange() bool { @@ -52,7 +52,7 @@ func (e WithinOptValidation) IsOutOfRange() bool { func NewWithinOptValidationError(flag string, value, low, high any) WithinOptValidationBehaviourQuery { return &WithinOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: WithinOptValidationTemplData{ OutOfRangeOV: OutOfRangeOV{ Flag: flag, @@ -86,7 +86,7 @@ type NotWithinOptValidationBehaviourQuery interface { } type NotWithinOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e NotWithinOptValidation) IsInsideOfRange() bool { @@ -95,7 +95,7 @@ func (e NotWithinOptValidation) IsInsideOfRange() bool { func NewNotWithinOptValidationError(flag string, value, low, high any) NotWithinOptValidationBehaviourQuery { return &NotWithinOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: NotWithinOptValidationTemplData{ OutOfRangeOV: OutOfRangeOV{ Flag: flag, @@ -139,7 +139,7 @@ type ContainsOptValidationBehaviourQuery[T any] interface { } type ContainsOptValidation[T any] struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e ContainsOptValidation[T]) IsAMemberOf() bool { @@ -148,7 +148,7 @@ func (e ContainsOptValidation[T]) IsAMemberOf() bool { func NewContainsOptValidationError[T any](flag string, value any, collection []T) ContainsOptValidationBehaviourQuery[T] { return &ContainsOptValidation[T]{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: ContainsOptValidationTemplData[T]{ ContainmentOV: ContainmentOV[T]{ Flag: flag, @@ -181,7 +181,7 @@ type NotContainsOptValidationBehaviourQuery[T any] interface { } type NotContainsOptValidation[T any] struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e NotContainsOptValidation[T]) IsNotAMemberOf() bool { @@ -190,7 +190,7 @@ func (e NotContainsOptValidation[T]) IsNotAMemberOf() bool { func NewNotContainsOptValidationError[T any](flag string, value any, collection []T) NotContainsOptValidationBehaviourQuery[T] { return &NotContainsOptValidation[T]{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: NotContainsOptValidationTemplData[T]{ ContainmentOV: ContainmentOV[T]{ Flag: flag, @@ -233,7 +233,7 @@ type MatchOptValidationBehaviourQuery interface { } type MatchOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e MatchOptValidation) IsMatch() bool { @@ -242,7 +242,7 @@ func (e MatchOptValidation) IsMatch() bool { func NewMatchOptValidationError(flag, value, pattern string) MatchOptValidationBehaviourQuery { return &MatchOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: MatchOptValidationTemplData{ MatchOV: MatchOV{ Flag: flag, @@ -275,7 +275,7 @@ type NotMatchOptValidationBehaviourQuery interface { } type NotMatchOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e NotMatchOptValidation) IsNotMatch() bool { @@ -284,7 +284,7 @@ func (e NotMatchOptValidation) IsNotMatch() bool { func NewNotMatchOptValidationError(flag, value, pattern string) NotMatchOptValidationBehaviourQuery { return &NotMatchOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: NotMatchOptValidationTemplData{ MatchOV: MatchOV{ Flag: flag, @@ -325,7 +325,7 @@ type GreaterThanOptValidationBehaviourQuery interface { } type GreaterThanOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e GreaterThanOptValidation) IsGreaterThan() bool { @@ -334,7 +334,7 @@ func (e GreaterThanOptValidation) IsGreaterThan() bool { func NewGreaterThanOptValidationError(flag string, value, threshold any) GreaterThanOptValidationBehaviourQuery { return &GreaterThanOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: GreaterThanOptValidationTemplData{ RelationalOV: RelationalOV{ Flag: flag, @@ -367,7 +367,7 @@ type AtLeastOptValidationBehaviourQuery interface { } type AtLeastOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e AtLeastOptValidation) IsAtLeast() bool { @@ -376,7 +376,7 @@ func (e AtLeastOptValidation) IsAtLeast() bool { func NewAtLeastOptValidationError(flag string, value, threshold any) AtLeastOptValidationBehaviourQuery { return &AtLeastOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: AtLeastOptValidationTemplData{ RelationalOV: RelationalOV{ Flag: flag, @@ -409,7 +409,7 @@ type LessThanOptValidationBehaviourQuery interface { } type LessThanOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e LessThanOptValidation) IsLessThan() bool { @@ -418,7 +418,7 @@ func (e LessThanOptValidation) IsLessThan() bool { func NewLessThanOptValidationError(flag string, value, threshold any) LessThanOptValidationBehaviourQuery { return &LessThanOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: AtLeastOptValidationTemplData{ RelationalOV: RelationalOV{ Flag: flag, @@ -451,7 +451,7 @@ type AtMostOptValidationBehaviourQuery interface { } type AtMostOptValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e AtMostOptValidation) IsAtMost() bool { @@ -460,7 +460,7 @@ func (e AtMostOptValidation) IsAtMost() bool { func NewAtMostOptValidationError(flag string, value, threshold any) AtMostOptValidationBehaviourQuery { return &AtMostOptValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: AtMostOptValidationTemplData{ RelationalOV: RelationalOV{ Flag: flag, @@ -494,7 +494,7 @@ type InvalidExtendedGlobFilterBehaviourQuery interface { } type InvalidExtendedGlobFilterValidation struct { - xi18n.LocalisableError + li18ngo.LocalisableError } func (e InvalidExtendedGlobFilterValidation) IsInvalidExtendedGlobFilter() bool { @@ -503,7 +503,7 @@ func (e InvalidExtendedGlobFilterValidation) IsInvalidExtendedGlobFilter() bool func NewInvalidExtendedGlobFilterValidationError(delimiter string) InvalidExtendedGlobFilterBehaviourQuery { return &InvalidExtendedGlobFilterValidation{ - LocalisableError: xi18n.LocalisableError{ + LocalisableError: li18ngo.LocalisableError{ Data: InvalidExtendedGlobFilterTemplData{ Delimiter: delimiter, }, diff --git a/src/store/families_test.go b/src/store/families_test.go index 0195875..66a43ee 100644 --- a/src/store/families_test.go +++ b/src/store/families_test.go @@ -11,7 +11,7 @@ import ( "github.com/snivilised/cobrass/src/assistant/locale" "github.com/snivilised/cobrass/src/internal/helpers" "github.com/snivilised/cobrass/src/store" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" ) func reason(binder string, err error) string { @@ -38,7 +38,7 @@ var _ = Describe("Families", Ordered, func() { repo string l10nPath string - from xi18n.LoadFrom + from li18ngo.LoadFrom rootCommand *cobra.Command execute func(args []string) ) @@ -47,14 +47,14 @@ var _ = Describe("Families", Ordered, func() { repo = helpers.Repo("../..") l10nPath = helpers.Path(repo, "Test/data/l10n") - from = xi18n.LoadFrom{ + from = li18ngo.LoadFrom{ Path: l10nPath, - Sources: xi18n.TranslationFiles{ - locale.CobrassSourceID: xi18n.TranslationSource{Name: "test"}, + Sources: li18ngo.TranslationFiles{ + locale.CobrassSourceID: li18ngo.TranslationSource{Name: "test"}, }, } - if err := xi18n.Use(func(o *xi18n.UseOptions) { + if err := li18ngo.Use(func(o *li18ngo.UseOptions) { o.From = from }); err != nil { Fail(err.Error()) diff --git a/src/store/family-cascade.go b/src/store/family-cascade.go index f0b078a..be18021 100644 --- a/src/store/family-cascade.go +++ b/src/store/family-cascade.go @@ -3,7 +3,8 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" + "github.com/spf13/pflag" ) @@ -24,7 +25,7 @@ func (f *CascadeParameterSet) BindAll( parent.BindUint( resolveNewFlagInfo( - xi18n.Text(locale.CascadeDepthParamUsageTemplData{}), + li18ngo.Text(locale.CascadeDepthParamUsageTemplData{}), defaultDepth, flagSet..., ), @@ -39,7 +40,7 @@ func (f *CascadeParameterSet) BindAll( parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.CascadeNoRecurseParamUsageTemplData{}), + li18ngo.Text(locale.CascadeNoRecurseParamUsageTemplData{}), defaultNoRecurse, flagSet..., ), diff --git a/src/store/family-filter.go b/src/store/family-filter.go index 2b7779d..336b606 100644 --- a/src/store/family-filter.go +++ b/src/store/family-filter.go @@ -5,7 +5,7 @@ import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" ) @@ -18,12 +18,12 @@ const ( // Therefore, for compound filters typically used when we want to filter // file system nodes by file name and directory name, we forego the // ability to specify compound file names (when using the navigator -// in extendio with the FoldersWithFiles subscription type) with a +// in traverse with the FoldersWithFiles subscription type) with a // short code, as this is seen as a niche feature. The more common // scenarios would be to either filter files, directories or both // by using an 'any' scope. With this compromise, the user would // always have to spell the compound file filter in it full form: -// --files-rx or --files-gb. When using extendio nav, the folders +// --files-rx or --files-gb. When using traverse nav, the folders // with files subscription would have to be used, ie there is no // standalone file file, so --files-rx and --files-gb are both free // to use without ambiguity. @@ -50,7 +50,7 @@ func (f *FilesFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FilesExGlobParamUsageTemplData{}), + li18ngo.Text(locale.FilesExGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -61,7 +61,7 @@ func (f *FilesFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FilesGlobParamUsageTemplData{}), + li18ngo.Text(locale.FilesGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -72,7 +72,7 @@ func (f *FilesFilterParameterSet) BindAll( // parent.BindValidatedString( resolveNewFlagInfo( - xi18n.Text(locale.FilesRegExParamUsageTemplData{}), + li18ngo.Text(locale.FilesRegExParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -103,7 +103,7 @@ func (f *FoldersFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FoldersGlobParamUsageTemplData{}), + li18ngo.Text(locale.FoldersGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -114,7 +114,7 @@ func (f *FoldersFilterParameterSet) BindAll( // parent.BindValidatedString( resolveNewFlagInfo( - xi18n.Text(locale.FoldersRexExParamUsageTemplData{}), + li18ngo.Text(locale.FoldersRexExParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -147,7 +147,7 @@ func (f *PolyFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FilesExGlobParamUsageTemplData{}), + li18ngo.Text(locale.FilesExGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -158,7 +158,7 @@ func (f *PolyFilterParameterSet) BindAll( // parent.BindValidatedString( resolveNewFlagInfo( - xi18n.Text(locale.FilesRegExParamUsageTemplData{}), + li18ngo.Text(locale.FilesRegExParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -173,7 +173,7 @@ func (f *PolyFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FoldersGlobParamUsageTemplData{}), + li18ngo.Text(locale.FoldersGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -184,7 +184,7 @@ func (f *PolyFilterParameterSet) BindAll( // parent.BindValidatedString( resolveNewFlagInfo( - xi18n.Text(locale.FoldersRexExParamUsageTemplData{}), + li18ngo.Text(locale.FoldersRexExParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -215,7 +215,7 @@ func (f *AlloyFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FilesExGlobParamUsageTemplData{}), + li18ngo.Text(locale.FilesExGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), @@ -226,7 +226,7 @@ func (f *AlloyFilterParameterSet) BindAll( // parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.FoldersGlobParamUsageTemplData{}), + li18ngo.Text(locale.FoldersGlobParamUsageTemplData{}), defaultFilterValue, flagSet..., ), diff --git a/src/store/family-i18n.go b/src/store/family-i18n.go index 380602f..07f685b 100644 --- a/src/store/family-i18n.go +++ b/src/store/family-i18n.go @@ -3,7 +3,7 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" "golang.org/x/text/language" ) @@ -24,7 +24,7 @@ func (f *I18nParameterSet) BindAll( parent.BindValidatedString( resolveNewFlagInfo( - xi18n.Text(locale.LanguageParamUsageTemplData{}), + li18ngo.Text(locale.LanguageParamUsageTemplData{}), defaultLanguage, flagSet..., ), diff --git a/src/store/family-interactions.go b/src/store/family-interactions.go index f2fb4f3..f8cb752 100644 --- a/src/store/family-interactions.go +++ b/src/store/family-interactions.go @@ -3,7 +3,7 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" ) @@ -23,7 +23,7 @@ func (f *TextualInteractionParameterSet) BindAll( parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.TextualInteractionIsNoTUIUsageTemplData{}), + li18ngo.Text(locale.TextualInteractionIsNoTUIUsageTemplData{}), defNoTUI, flagSet..., ), @@ -47,7 +47,7 @@ func (f *CliInteractionParameterSet) BindAll( parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.CliInteractionIsTUIUsageTemplData{}), + li18ngo.Text(locale.CliInteractionIsTUIUsageTemplData{}), defIsTUI, flagSet..., ), diff --git a/src/store/family-preview.go b/src/store/family-preview.go index 73aa058..8986672 100644 --- a/src/store/family-preview.go +++ b/src/store/family-preview.go @@ -3,7 +3,7 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" ) @@ -23,7 +23,7 @@ func (f *PreviewParameterSet) BindAll( parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.DryRunParamUsageTemplData{}), + li18ngo.Text(locale.DryRunParamUsageTemplData{}), defaultDryRun, flagSet..., ), diff --git a/src/store/family-profile.go b/src/store/family-profile.go index 553a8ff..867568e 100644 --- a/src/store/family-profile.go +++ b/src/store/family-profile.go @@ -3,7 +3,7 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" ) @@ -24,7 +24,7 @@ func (f *ProfileParameterSet) BindAll( parent.BindValidatedStringIsMatch( resolveNewFlagInfo( - xi18n.Text(locale.ProfileParamUsageTemplData{}), + li18ngo.Text(locale.ProfileParamUsageTemplData{}), defaultProfile, flagSet..., ), @@ -40,7 +40,7 @@ func (f *ProfileParameterSet) BindAll( parent.BindString( resolveNewFlagInfo( - xi18n.Text(locale.SchemeParamUsageTemplData{}), + li18ngo.Text(locale.SchemeParamUsageTemplData{}), defaultScheme, flagSet..., ), diff --git a/src/store/family-sampling.go b/src/store/family-sampling.go index 3c68949..6871acb 100644 --- a/src/store/family-sampling.go +++ b/src/store/family-sampling.go @@ -3,7 +3,7 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" ) @@ -26,7 +26,7 @@ func (f *SamplingParameterSet) BindAll( // parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.SamplingSampleUsageTemplData{}), + li18ngo.Text(locale.SamplingSampleUsageTemplData{}), defIsSampling, flagSet..., ), @@ -43,7 +43,7 @@ func (f *SamplingParameterSet) BindAll( // parent.BindValidatedUintWithin( resolveNewFlagInfo( - xi18n.Text(locale.SamplingNoFilesUsageTemplData{}), + li18ngo.Text(locale.SamplingNoFilesUsageTemplData{}), defFSItems, flagSet..., ), @@ -56,7 +56,7 @@ func (f *SamplingParameterSet) BindAll( // parent.BindValidatedUintWithin( resolveNewFlagInfo( - xi18n.Text(locale.SamplingNoFoldersUsageTemplData{}), + li18ngo.Text(locale.SamplingNoFoldersUsageTemplData{}), defFSItems, flagSet..., ), @@ -73,7 +73,7 @@ func (f *SamplingParameterSet) BindAll( // parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.SamplingLastUsageTemplData{}), + li18ngo.Text(locale.SamplingLastUsageTemplData{}), defIsLast, flagSet..., ), diff --git a/src/store/family-worker-pool.go b/src/store/family-worker-pool.go index b5d4b41..5a34084 100644 --- a/src/store/family-worker-pool.go +++ b/src/store/family-worker-pool.go @@ -3,7 +3,7 @@ package store import ( "github.com/snivilised/cobrass/src/assistant" "github.com/snivilised/cobrass/src/assistant/locale" - xi18n "github.com/snivilised/extendio/i18n" + "github.com/snivilised/li18ngo" "github.com/spf13/pflag" ) @@ -24,7 +24,7 @@ func (f *WorkerPoolParameterSet) BindAll( parent.BindBool( resolveNewFlagInfo( - xi18n.Text(locale.WorkerPoolCPUParamUsageTemplData{}), + li18ngo.Text(locale.WorkerPoolCPUParamUsageTemplData{}), defaultCPU, flagSet..., ), @@ -41,7 +41,7 @@ func (f *WorkerPoolParameterSet) BindAll( parent.BindValidatedIntWithin( resolveNewFlagInfo( - xi18n.Text(locale.WorkerPoolNoWParamUsageTemplData{}), + li18ngo.Text(locale.WorkerPoolNoWParamUsageTemplData{}), defaultNoW, flagSet..., ),