Skip to content
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

Fix time.Duration translation error #1154

Merged
merged 2 commits into from
Feb 22, 2025
Merged

Fix time.Duration translation error #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5e6d36
Fix time.Duration translation error
nodivbyzero Aug 29, 2023
f94273c
Merge remote-tracking branch 'upstream/master' into duration-translat…
nodivbyzero Feb 20, 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
70 changes: 56 additions & 14 deletions translations/en/en.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,18 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
var err error
var t string

var f64 float64
var digits uint64
var kind reflect.Kind

if idx := strings.Index(fe.Param(), "."); idx != -1 {
digits = uint64(len(fe.Param()[idx+1:]))
}
fn := func() (err error) {
if idx := strings.Index(fe.Param(), "."); idx != -1 {
digits = uint64(len(fe.Param()[idx+1:]))
}

f64, err := strconv.ParseFloat(fe.Param(), 64)
if err != nil {
goto END
f64, err = strconv.ParseFloat(fe.Param(), 64)

return
}

kind = fe.Kind()
Expand All @@ -240,6 +241,11 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er

var c string

err = fn()
if err != nil {
goto END
}

c, err = ut.C("min-string-character", f64, digits, ut.FmtNumber(f64, digits))
if err != nil {
goto END
Expand All @@ -250,6 +256,11 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
case reflect.Slice, reflect.Map, reflect.Array:
var c string

err = fn()
if err != nil {
goto END
}

c, err = ut.C("min-items-item", f64, digits, ut.FmtNumber(f64, digits))
if err != nil {
goto END
Expand All @@ -258,6 +269,16 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
t, err = ut.T("min-items", fe.Field(), c)

default:
if fe.Type() == reflect.TypeOf(time.Duration(0)) {
t, err = ut.T("min-number", fe.Field(), fe.Param())
goto END
}

err = fn()
if err != nil {
goto END
}

t, err = ut.T("min-number", fe.Field(), ut.FmtNumber(f64, digits))
}

Expand Down Expand Up @@ -305,17 +326,18 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
var err error
var t string

var f64 float64
var digits uint64
var kind reflect.Kind

if idx := strings.Index(fe.Param(), "."); idx != -1 {
digits = uint64(len(fe.Param()[idx+1:]))
}
fn := func() (err error) {
if idx := strings.Index(fe.Param(), "."); idx != -1 {
digits = uint64(len(fe.Param()[idx+1:]))
}

f64, err := strconv.ParseFloat(fe.Param(), 64)
if err != nil {
goto END
f64, err = strconv.ParseFloat(fe.Param(), 64)

return
}

kind = fe.Kind()
Expand All @@ -328,6 +350,11 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er

var c string

err = fn()
if err != nil {
goto END
}

c, err = ut.C("max-string-character", f64, digits, ut.FmtNumber(f64, digits))
if err != nil {
goto END
Expand All @@ -338,6 +365,11 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
case reflect.Slice, reflect.Map, reflect.Array:
var c string

err = fn()
if err != nil {
goto END
}

c, err = ut.C("max-items-item", f64, digits, ut.FmtNumber(f64, digits))
if err != nil {
goto END
Expand All @@ -346,6 +378,16 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
t, err = ut.T("max-items", fe.Field(), c)

default:
if fe.Type() == reflect.TypeOf(time.Duration(0)) {
t, err = ut.T("max-number", fe.Field(), fe.Param())
goto END
}

err = fn()
if err != nil {
goto END
}

t, err = ut.T("max-number", fe.Field(), ut.FmtNumber(f64, digits))
}

Expand Down
21 changes: 17 additions & 4 deletions translations/en/en_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,12 @@ func TestTranslations(t *testing.T) {
Datetime string `validate:"datetime=2006-01-02"`
PostCode string `validate:"postcode_iso3166_alpha2=SG"`
PostCodeCountry string
PostCodeByField string `validate:"postcode_iso3166_alpha2_field=PostCodeCountry"`
BooleanString string `validate:"boolean"`
Image string `validate:"image"`
CveString string `validate:"cve"`
PostCodeByField string `validate:"postcode_iso3166_alpha2_field=PostCodeCountry"`
BooleanString string `validate:"boolean"`
Image string `validate:"image"`
CveString string `validate:"cve"`
MinDuration time.Duration `validate:"min=1h30m,max=2h"`
MaxDuration time.Duration `validate:"min=1h30m,max=2h"`
}

var test Test
Expand Down Expand Up @@ -248,6 +250,9 @@ func TestTranslations(t *testing.T) {
test.BooleanString = "A"
test.CveString = "A"

test.MinDuration = 1 * time.Hour
test.MaxDuration = 3 * time.Hour

test.Inner.RequiredIf = "abcd"

err = validate.Struct(test)
Expand Down Expand Up @@ -792,6 +797,14 @@ func TestTranslations(t *testing.T) {
ns: "Test.CveString",
expected: "CveString must be a valid cve identifier",
},
{
ns: "Test.MinDuration",
expected: "MinDuration must be 1h30m or greater",
},
{
ns: "Test.MaxDuration",
expected: "MaxDuration must be 2h or less",
},
}

for _, tt := range tests {
Expand Down