Skip to content

Commit b65e888

Browse files
committed
1 parent 22d2df1 commit b65e888

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

grails-app/taglib/org/grails/jquery/validation/ui/JQueryValidationUiTagLib.groovy

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2010 the original author or authors.
1+
/* Copyright 2010-2012 the original author or authors.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -152,9 +152,11 @@ class JQueryValidationUiTagLib {
152152
String errorClass = attrs.errorClass?:config.errorClass?:"error"
153153
String validClass = attrs.validClass?:config.validClass?:"valid"
154154
def onsubmit = attrs.onsubmit ? Boolean.valueOf(attrs.onsubmit) : config.get("onsubmit", true)
155-
def submitHandler = attrs.remove("submitHandler")
155+
def submitHandler = attrs.remove("submitHandler")
156156
def renderErrorsOnTop = attrs.renderErrorsOnTop ? Boolean.valueOf(attrs.renderErrorsOnTop) : config.get("renderErrorsOnTop", true)
157157
String renderErrorsOptions
158+
Locale locale = RCU.getLocale(request)
159+
158160
if (!forClass) {
159161
throwTagError("${TAG_ERROR_PREFIX}Tag missing required attribute [for]")
160162
}
@@ -247,10 +249,10 @@ rules: {
247249
constrainedPropertiesEntries << childConstrainedPropertiesEntry
248250
}
249251

250-
out << createJavaScriptConstraints(constrainedPropertiesEntries)
252+
out << createJavaScriptConstraints(constrainedPropertiesEntries, locale)
251253
out << "},\n" // end rules
252254
out << "messages: {\n"
253-
out << createJavaScriptMessages(constrainedPropertiesEntries)
255+
out << createJavaScriptMessages(constrainedPropertiesEntries, locale)
254256
out << "}\n" // end messages
255257
out << "});\n"
256258
out << "});\n"
@@ -274,7 +276,7 @@ rules: {
274276
return constraintsMap
275277
}
276278

277-
private String createJavaScriptConstraints(List constrainedPropertiesEntries) {
279+
private String createJavaScriptConstraints(List constrainedPropertiesEntries, Locale locale) {
278280
String javaScriptConstraints = ""
279281
def constraintsMap
280282
String javaScriptConstraint
@@ -305,7 +307,7 @@ rules: {
305307
case Float:
306308
case Double:
307309
case BigDecimal:
308-
javaScriptConstraintCode = "\tnumber: true"
310+
javaScriptConstraintCode = "\t${(locale.country == 'br' || locale.country == 'de')?'numberDE':'number'}: true"
309311
break
310312
}
311313

@@ -442,7 +444,7 @@ rules: {
442444
return constraintNames
443445
}
444446

445-
private String createJavaScriptMessages(List constrainedPropertiesEntries) {
447+
private String createJavaScriptMessages(List constrainedPropertiesEntries, Locale locale) {
446448
def constraintsMap
447449
def args = []
448450
String javaScriptMessages = ""
@@ -473,7 +475,10 @@ rules: {
473475
case Float:
474476
case Double:
475477
case BigDecimal:
476-
javaScriptMessageCode = "\tnumber: '${getTypeMismatchMessage(constrainedPropertiesEntry.validatableClass, constrainedProperty.propertyType, constrainedPropertiesEntry.namespace, constrainedProperty.propertyName)}'"
478+
if (locale.country == 'br' || locale.country == 'de')
479+
javaScriptMessageCode = "\tnumberDE: '${getTypeMismatchMessage(constrainedPropertiesEntry.validatableClass, constrainedProperty.propertyType, constrainedPropertiesEntry.namespace, constrainedProperty.propertyName)}'"
480+
else
481+
javaScriptMessageCode = "\tnumber: '${getTypeMismatchMessage(constrainedPropertiesEntry.validatableClass, constrainedProperty.propertyType, constrainedPropertiesEntry.namespace, constrainedProperty.propertyName)}'"
477482
break
478483
}
479484

0 commit comments

Comments
 (0)