Skip to content

Commit 4f5cf1d

Browse files
jnstjnst
authored
Update Japanese translations (#1013)
* Update japanese translations for required_if, unique, json, jwt, lowercase, uppercase, datetime, postcode_iso3166_alpha2, postcode_iso3166_alpha2_field, boolean * Remove unnecessary blank lines
1 parent 2f3efda commit 4f5cf1d

File tree

2 files changed

+256
-145
lines changed

2 files changed

+256
-145
lines changed

‎translations/ja/ja.go‎

Lines changed: 77 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
// RegisterDefaultTranslations registers a set of default translations
1717
// for all built in tag's in validator; you may add your own as desired.
1818
func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (err error) {
19-
2019
translations := []struct {
2120
tag string
2221
translation string
@@ -29,10 +28,14 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
2928
translation: "{0}は必須フィールドです",
3029
override: false,
3130
},
31+
{
32+
tag: "required_if",
33+
translation: "{0}は必須フィールドです",
34+
override: false,
35+
},
3236
{
3337
tag: "len",
3438
customRegisFunc: func(ut ut.Translator) (err error) {
35-
3639
if err = ut.Add("len-string", "{0}の長さは{1}でなければなりません", false); err != nil {
3740
return
3841
}
@@ -64,7 +67,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
6467

6568
},
6669
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
67-
6870
var err error
6971
var t string
7072

@@ -123,7 +125,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
123125
{
124126
tag: "min",
125127
customRegisFunc: func(ut ut.Translator) (err error) {
126-
127128
if err = ut.Add("min-string", "{0}の長さは少なくとも{1}はなければなりません", false); err != nil {
128129
return
129130
}
@@ -155,7 +156,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
155156

156157
},
157158
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
158-
159159
var err error
160160
var t string
161161

@@ -214,7 +214,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
214214
{
215215
tag: "max",
216216
customRegisFunc: func(ut ut.Translator) (err error) {
217-
218217
if err = ut.Add("max-string", "{0}の長さは最大でも{1}でなければなりません", false); err != nil {
219218
return
220219
}
@@ -307,7 +306,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
307306
translation: "{0}は{1}と等しくありません",
308307
override: false,
309308
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
310-
311309
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
312310
if err != nil {
313311
fmt.Printf("warning: error translating FieldError: %#v", fe)
@@ -391,7 +389,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
391389
{
392390
tag: "lt",
393391
customRegisFunc: func(ut ut.Translator) (err error) {
394-
395392
if err = ut.Add("lt-string", "{0}の長さは{1}よりも少なくなければなりません", false); err != nil {
396393
return
397394
}
@@ -512,7 +509,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
512509
{
513510
tag: "lte",
514511
customRegisFunc: func(ut ut.Translator) (err error) {
515-
516512
if err = ut.Add("lte-string", "{0}の長さは最大でも{1}でなければなりません", false); err != nil {
517513
return
518514
}
@@ -632,7 +628,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
632628
{
633629
tag: "gt",
634630
customRegisFunc: func(ut ut.Translator) (err error) {
635-
636631
if err = ut.Add("gt-string", "{0}の長さは{1}よりも多くなければなりません", false); err != nil {
637632
return
638633
}
@@ -752,7 +747,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
752747
{
753748
tag: "gte",
754749
customRegisFunc: func(ut ut.Translator) (err error) {
755-
756750
if err = ut.Add("gte-string", "{0}の長さは少なくとも{1}以上はなければなりません", false); err != nil {
757751
return
758752
}
@@ -874,7 +868,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
874868
translation: "{0}は{1}と等しくなければなりません",
875869
override: false,
876870
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
877-
878871
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
879872
if err != nil {
880873
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -889,7 +882,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
889882
translation: "{0}は{1}と等しくなければなりません",
890883
override: false,
891884
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
892-
893885
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
894886
if err != nil {
895887
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -904,7 +896,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
904896
translation: "{0}は{1}とは異ならなければなりません",
905897
override: false,
906898
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
907-
908899
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
909900
if err != nil {
910901
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -919,7 +910,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
919910
translation: "{0}は{1}よりも大きくなければなりません",
920911
override: false,
921912
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
922-
923913
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
924914
if err != nil {
925915
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -934,7 +924,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
934924
translation: "{0}は{1}以上でなければなりません",
935925
override: false,
936926
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
937-
938927
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
939928
if err != nil {
940929
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -949,7 +938,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
949938
translation: "{0}は{1}よりも小さくなければなりません",
950939
override: false,
951940
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
952-
953941
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
954942
if err != nil {
955943
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -964,7 +952,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
964952
translation: "{0}は{1}以下でなければなりません",
965953
override: false,
966954
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
967-
968955
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
969956
if err != nil {
970957
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -979,7 +966,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
979966
translation: "{0}は{1}とは異ならなければなりません",
980967
override: false,
981968
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
982-
983969
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
984970
if err != nil {
985971
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -994,7 +980,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
994980
translation: "{0}は{1}よりも大きくなければなりません",
995981
override: false,
996982
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
997-
998983
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
999984
if err != nil {
1000985
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1009,7 +994,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
1009994
translation: "{0}は{1}以上でなければなりません",
1010995
override: false,
1011996
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1012-
1013997
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
1014998
if err != nil {
1015999
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1024,7 +1008,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
10241008
translation: "{0}は{1}よりも小さくなければなりません",
10251009
override: false,
10261010
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1027-
10281011
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
10291012
if err != nil {
10301013
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1039,7 +1022,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
10391022
translation: "{0}は{1}以下でなければなりません",
10401023
override: false,
10411024
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1042-
10431025
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
10441026
if err != nil {
10451027
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1124,7 +1106,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
11241106
translation: "{0}は'{1}'を含まなければなりません",
11251107
override: false,
11261108
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1127-
11281109
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
11291110
if err != nil {
11301111
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1139,7 +1120,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
11391120
translation: "{0}は'{1}'の少なくとも1つを含まなければなりません",
11401121
override: false,
11411122
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1142-
11431123
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
11441124
if err != nil {
11451125
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1154,7 +1134,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
11541134
translation: "{0}には'{1}'というテキストを含むことはできません",
11551135
override: false,
11561136
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1157-
11581137
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
11591138
if err != nil {
11601139
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1169,7 +1148,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
11691148
translation: "{0}には'{1}'のどれも含めることはできません",
11701149
override: false,
11711150
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1172-
11731151
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
11741152
if err != nil {
11751153
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1184,7 +1162,6 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
11841162
translation: "{0}には'{1}'を含めることはできません",
11851163
override: false,
11861164
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1187-
11881165
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
11891166
if err != nil {
11901167
log.Printf("warning: error translating FieldError: %#v", fe)
@@ -1354,6 +1331,11 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
13541331
translation: "{0}は正しいMACアドレスを含まなければなりません",
13551332
override: false,
13561333
},
1334+
{
1335+
tag: "unique",
1336+
translation: "{0}は一意な値のみを含まなければなりません",
1337+
override: false,
1338+
},
13571339
{
13581340
tag: "iscolor",
13591341
translation: "{0}は正しい色でなければなりません",
@@ -1372,22 +1354,83 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
13721354
return s
13731355
},
13741356
},
1357+
{
1358+
tag: "json",
1359+
translation: "{0}は正しいJSON文字列でなければなりません",
1360+
override: false,
1361+
},
1362+
{
1363+
tag: "jwt",
1364+
translation: "{0}は正しいJWT文字列でなければなりません",
1365+
override: false,
1366+
},
1367+
{
1368+
tag: "lowercase",
1369+
translation: "{0}は小文字でなければなりません",
1370+
override: false,
1371+
},
1372+
{
1373+
tag: "uppercase",
1374+
translation: "{0}は大文字でなければなりません",
1375+
override: false,
1376+
},
1377+
{
1378+
tag: "datetime",
1379+
translation: "{0}は{1}の書式と一致しません",
1380+
override: false,
1381+
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1382+
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
1383+
if err != nil {
1384+
log.Printf("warning: error translating FieldError: %#v", fe)
1385+
return fe.(error).Error()
1386+
}
1387+
1388+
return t
1389+
},
1390+
},
1391+
{
1392+
tag: "postcode_iso3166_alpha2",
1393+
translation: "{0}は国名コード{1}の郵便番号形式と一致しません",
1394+
override: false,
1395+
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1396+
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
1397+
if err != nil {
1398+
log.Printf("warning: error translating FieldError: %#v", fe)
1399+
return fe.(error).Error()
1400+
}
1401+
1402+
return t
1403+
},
1404+
},
1405+
{
1406+
tag: "postcode_iso3166_alpha2_field",
1407+
translation: "{0}は{1}フィールドで指定された国名コードの郵便番号形式と一致しません",
1408+
override: false,
1409+
customTransFunc: func(ut ut.Translator, fe validator.FieldError) string {
1410+
t, err := ut.T(fe.Tag(), fe.Field(), fe.Param())
1411+
if err != nil {
1412+
log.Printf("warning: error translating FieldError: %#v", fe)
1413+
return fe.(error).Error()
1414+
}
1415+
1416+
return t
1417+
},
1418+
},
1419+
{
1420+
tag: "boolean",
1421+
translation: "{0}は正しいブール値でなければなりません",
1422+
override: false,
1423+
},
13751424
}
13761425

13771426
for _, t := range translations {
13781427

13791428
if t.customTransFunc != nil && t.customRegisFunc != nil {
1380-
13811429
err = v.RegisterTranslation(t.tag, trans, t.customRegisFunc, t.customTransFunc)
1382-
13831430
} else if t.customTransFunc != nil && t.customRegisFunc == nil {
1384-
13851431
err = v.RegisterTranslation(t.tag, trans, registrationFunc(t.tag, t.translation, t.override), t.customTransFunc)
1386-
13871432
} else if t.customTransFunc == nil && t.customRegisFunc != nil {
1388-
13891433
err = v.RegisterTranslation(t.tag, trans, t.customRegisFunc, translateFunc)
1390-
13911434
} else {
13921435
err = v.RegisterTranslation(t.tag, trans, registrationFunc(t.tag, t.translation, t.override), translateFunc)
13931436
}
@@ -1401,9 +1444,7 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
14011444
}
14021445

14031446
func registrationFunc(tag string, translation string, override bool) validator.RegisterTranslationsFunc {
1404-
14051447
return func(ut ut.Translator) (err error) {
1406-
14071448
if err = ut.Add(tag, translation, override); err != nil {
14081449
return
14091450
}
@@ -1415,7 +1456,6 @@ func registrationFunc(tag string, translation string, override bool) validator.R
14151456
}
14161457

14171458
func translateFunc(ut ut.Translator, fe validator.FieldError) string {
1418-
14191459
t, err := ut.T(fe.Tag(), fe.Field())
14201460
if err != nil {
14211461
log.Printf("warning: error translating FieldError: %#v", fe)

0 commit comments

Comments
 (0)