Skip to content

Register Translator and get it as a function #1407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Register Translator and get it as a function #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ae7f28
Register Translator and get it as a function
aliworkshop Mar 30, 2025
fdb018a
add translator test
aliworkshop Mar 30, 2025
49b01e6
add multi locale to validator Translator
aliworkshop Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions validator_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ type Validate struct {
aliases map[string]string
validations map[string]internalValidationFuncWrapper
transTagFunc map[ut.Translator]map[string]TranslationFunc // map[<locale>]map[<tag>]TranslationFunc
translator map[string]ut.Translator
rules map[reflect.Type]map[string]string
tagCache *tagCache
structCache *structCache
Expand All @@ -115,6 +116,7 @@ func New(options ...Option) *Validate {
tagName: defaultTagName,
aliases: make(map[string]string, len(bakedInAliases)),
validations: make(map[string]internalValidationFuncWrapper, len(bakedInValidators)),
translator: make(map[string]ut.Translator),
tagCache: tc,
structCache: sc,
}
Expand Down Expand Up @@ -361,6 +363,14 @@ func (v *Validate) RegisterTranslation(tag string, trans ut.Translator, register
return
}

func (v *Validate) RegisterTranslator(trans ut.Translator, locale string) {
v.translator[locale] = trans
}

func (v *Validate) Translator(locale string) ut.Translator {
return v.translator[locale]
}

// Struct validates a structs exposed fields, and automatically validates nested structs, unless otherwise specified.
//
// It returns InvalidValidationError for bad values passed in and nil or ValidationErrors as error otherwise.
Expand Down
14 changes: 8 additions & 6 deletions validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9489,7 +9489,9 @@ func TestTranslations(t *testing.T) {
fr, _ := uni.GetTranslator("fr")

validate := New()
err := validate.RegisterTranslation("required", trans,
validate.RegisterTranslator(trans, "en")
validate.RegisterTranslator(fr, "fr")
err := validate.RegisterTranslation("required", validate.Translator("en"),
func(ut ut.Translator) (err error) {
// using this stype because multiple translation may have to be added for the full translation
if err = ut.Add("required", "{0} is a required field", false); err != nil {
Expand All @@ -9508,7 +9510,7 @@ func TestTranslations(t *testing.T) {
})
Equal(t, err, nil)

err = validate.RegisterTranslation("required", fr,
err = validate.RegisterTranslation("required", validate.Translator("fr"),
func(ut ut.Translator) (err error) {
// using this stype because multiple translation may have to be added for the full translation
if err = ut.Add("required", "{0} est un champ obligatoire", false); err != nil {
Expand Down Expand Up @@ -9543,22 +9545,22 @@ func TestTranslations(t *testing.T) {
fe := errs[0]
Equal(t, fe.Tag(), "required")
Equal(t, fe.Namespace(), "Test.Value")
Equal(t, fe.Translate(trans), fmt.Sprintf("%s is a required field", fe.Field()))
Equal(t, fe.Translate(validate.Translator("en")), fmt.Sprintf("%s is a required field", fe.Field()))
Equal(t, fe.Translate(fr), fmt.Sprintf("%s est un champ obligatoire", fe.Field()))

nl := nl.New()
uni2 := ut.New(nl, nl)
trans2, _ := uni2.GetTranslator("nl")
Equal(t, fe.Translate(trans2), "Key: 'Test.Value' Error:Field validation for 'Value' failed on the 'required' tag")

terrs := errs.Translate(trans)
terrs := errs.Translate(validate.Translator("en"))
Equal(t, len(terrs), 1)

v, ok := terrs["Test.Value"]
Equal(t, ok, true)
Equal(t, v, fmt.Sprintf("%s is a required field", fe.Field()))

terrs = errs.Translate(fr)
terrs = errs.Translate(validate.Translator("fr"))
Equal(t, len(terrs), 1)

v, ok = terrs["Test.Value"]
Expand All @@ -9580,7 +9582,7 @@ func TestTranslations(t *testing.T) {
fe = errs[0]
Equal(t, fe.Tag(), "gt")
Equal(t, fe.Namespace(), "Test2.Value")
Equal(t, fe.Translate(trans), "Key: 'Test2.Value' Error:Field validation for 'Value' failed on the 'gt' tag")
Equal(t, fe.Translate(validate.Translator("en")), "Key: 'Test2.Value' Error:Field validation for 'Value' failed on the 'gt' tag")
}

func TestTranslationErrors(t *testing.T) {
Expand Down
Loading