diff --git a/translations/it/it.go b/translations/it/it.go index d8ea8906..c3d57abd 100644 --- a/translations/it/it.go +++ b/translations/it/it.go @@ -13,10 +13,8 @@ import ( "github.com/go-playground/validator/v10" ) -// RegisterDefaultTranslations registers a set of default translations -// for all built in tag's in validator; you may add your own as desired. +// RegisterDefaultTranslations registers a set of default translations for all built in tag's in validator; you may add your own as desired. func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (err error) { - translations := []struct { tag string translation string @@ -37,7 +35,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "len", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("len-string", "{0} deve essere {1} di lunghezza", false); err != nil { return } @@ -66,10 +63,8 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er } return - }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string @@ -128,7 +123,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "min", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("min-string", "{0} deve essere almeno {1} di lunghezza", false); err != nil { return } @@ -157,10 +151,8 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er } return - }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string @@ -219,7 +211,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "max", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("max-string", "{0} deve avere una lunghezza massima di {1}", false); err != nil { return } @@ -248,10 +239,8 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er } return - }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string @@ -312,7 +301,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non è uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { fmt.Printf("warning: error translating FieldError: %#v", fe) @@ -327,7 +315,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non dovrebbe essere uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { fmt.Printf("warning: error translating FieldError: %#v", fe) @@ -340,7 +327,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "lt", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("lt-string", "{0} deve essere inferiore a {1} di lunghezza", false); err != nil { return } @@ -374,10 +360,8 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er } return - }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string var f64 float64 @@ -385,7 +369,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er var kind reflect.Kind fn := func() (err error) { - if idx := strings.Index(fe.Param(), "."); idx != -1 { digits = uint64(len(fe.Param()[idx+1:])) } @@ -461,7 +444,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "lte", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("lte-string", "{0} deve avere una lunghezza massima di {1}", false); err != nil { return } @@ -497,7 +479,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er return }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string var f64 float64 @@ -505,7 +486,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er var kind reflect.Kind fn := func() (err error) { - if idx := strings.Index(fe.Param(), "."); idx != -1 { digits = uint64(len(fe.Param()[idx+1:])) } @@ -581,7 +561,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "gt", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("gt-string", "{0} deve essere maggiore di {1} di lunghezza", false); err != nil { return } @@ -617,7 +596,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er return }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string var f64 float64 @@ -625,7 +603,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er var kind reflect.Kind fn := func() (err error) { - if idx := strings.Index(fe.Param(), "."); idx != -1 { digits = uint64(len(fe.Param()[idx+1:])) } @@ -701,7 +678,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er { tag: "gte", customRegisFunc: func(ut ut.Translator) (err error) { - if err = ut.Add("gte-string", "{0} deve essere almeno {1} di lunghezza", false); err != nil { return } @@ -737,7 +713,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er return }, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - var err2 error var t string var f64 float64 @@ -745,7 +720,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er var kind reflect.Kind fn := func() (err error) { - if idx := strings.Index(fe.Param(), "."); idx != -1 { digits = uint64(len(fe.Param()[idx+1:])) } @@ -823,7 +797,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -838,7 +811,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -853,7 +825,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non può essere uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -868,7 +839,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere maggiore di {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -883,7 +853,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere maggiore o uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -898,7 +867,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere minore di {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -913,7 +881,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere minore o uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -928,7 +895,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non può essere uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -943,7 +909,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere maggiore di {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -958,7 +923,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere maggiore o uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -973,7 +937,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere minore di {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -988,7 +951,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve essere minore o uguale a {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1078,7 +1040,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve contenere il testo '{1}'", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1093,7 +1054,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} deve contenere almeno uno dei seguenti caratteri '{1}'", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1108,7 +1068,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non può contenere il testo '{1}'", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1123,7 +1082,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non può contenere nessuno dei seguenti caratteri '{1}'", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1138,7 +1096,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non può contenere '{1}'", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1346,7 +1303,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er translation: "{0} non corrisponde al formato {1}", override: false, customTransFunc: func(ut ut.Translator, fe validator.FieldError) string { - t, err2 := ut.T(fe.Tag(), fe.Field(), fe.Param()) if err2 != nil { log.Printf("warning: error translating FieldError: %#v", fe) @@ -1359,19 +1315,12 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er } for _, t := range translations { - if t.customTransFunc != nil && t.customRegisFunc != nil { - err = v.RegisterTranslation(t.tag, trans, t.customRegisFunc, t.customTransFunc) - } else if t.customTransFunc != nil && t.customRegisFunc == nil { - err = v.RegisterTranslation(t.tag, trans, registrationFunc(t.tag, t.translation, t.override), t.customTransFunc) - } else if t.customTransFunc == nil && t.customRegisFunc != nil { - err = v.RegisterTranslation(t.tag, trans, t.customRegisFunc, translateFunc) - } else { err = v.RegisterTranslation(t.tag, trans, registrationFunc(t.tag, t.translation, t.override), translateFunc) } @@ -1385,21 +1334,16 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er } func registrationFunc(tag string, translation string, override bool) validator.RegisterTranslationsFunc { - return func(ut ut.Translator) (err error) { - if err = ut.Add(tag, translation, override); err != nil { return } return - } - } func translateFunc(ut ut.Translator, fe validator.FieldError) string { - t, err := ut.T(fe.Tag(), fe.Field()) if err != nil { log.Printf("warning: error translating FieldError: %#v", fe)