rleland 2003/08/29 20:52:43
Modified: web/validator index.jsp jsRegistration.jsp jsType.jsp
multiRegistration1.jsp multiRegistration2.jsp
registration.jsp type.jsp
web/validator/WEB-INF validation.xml
Log:
Bug 18255 Provide Japanese resources updates for Struts
Patches submitted by Tetsuo Ajima, Tatsuo Takahashi, Satoshi Hioki
Yoshinori Ashizawa
Thank you very much !
Revision Changes Path
1.3 +4 -0 jakarta-struts/web/validator/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/index.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.jsp 18 May 2003 02:43:46 -0000 1.2
+++ index.jsp 30 Aug 2003 03:52:42 -0000 1.3
@@ -65,6 +65,10 @@
<html:link page="/locale.do?language=fr&country=CA">French Canadian |
Francais Canadien</html:link> -
<bean:message key="localeForm.frCA"/>
</li>
+ <li>
+ <html:link page="/locale.do?language=ja">Japanese | Japonais</html:link> -
+ <bean:message key="localeForm.ja"/>
+ </li>
</ul>
<p> </p>
1.2 +1 -1 jakarta-struts/web/validator/jsRegistration.jsp
Index: jsRegistration.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/jsRegistration.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsRegistration.jsp 19 Mar 2002 03:31:51 -0000 1.1
+++ jsRegistration.jsp 30 Aug 2003 03:52:42 -0000 1.2
@@ -1,4 +1,4 @@
-<%@ page language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
1.5 +1 -1 jakarta-struts/web/validator/jsType.jsp
Index: jsType.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/jsType.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jsType.jsp 15 Aug 2003 18:25:32 -0000 1.4
+++ jsType.jsp 30 Aug 2003 03:52:42 -0000 1.5
@@ -1,4 +1,4 @@
-<%@ page language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
1.2 +1 -1 jakarta-struts/web/validator/multiRegistration1.jsp
Index: multiRegistration1.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/multiRegistration1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multiRegistration1.jsp 19 Mar 2002 03:31:51 -0000 1.1
+++ multiRegistration1.jsp 30 Aug 2003 03:52:42 -0000 1.2
@@ -1,4 +1,4 @@
-<%@ page language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
1.2 +1 -1 jakarta-struts/web/validator/multiRegistration2.jsp
Index: multiRegistration2.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/multiRegistration2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multiRegistration2.jsp 19 Mar 2002 03:31:51 -0000 1.1
+++ multiRegistration2.jsp 30 Aug 2003 03:52:42 -0000 1.2
@@ -1,4 +1,4 @@
-<%@ page language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
1.2 +1 -1 jakarta-struts/web/validator/registration.jsp
Index: registration.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/registration.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- registration.jsp 19 Mar 2002 03:31:51 -0000 1.1
+++ registration.jsp 30 Aug 2003 03:52:42 -0000 1.2
@@ -1,4 +1,4 @@
-<%@ page language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
1.4 +1 -1 jakarta-struts/web/validator/type.jsp
Index: type.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/type.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- type.jsp 11 Oct 2002 19:13:42 -0000 1.3
+++ type.jsp 30 Aug 2003 03:52:42 -0000 1.4
@@ -1,4 +1,4 @@
-<%@ page language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
1.6 +268 -0 jakarta-struts/web/validator/WEB-INF/validation.xml
Index: validation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/WEB-INF/validation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- validation.xml 26 Oct 2002 00:25:25 -0000 1.5
+++ validation.xml 30 Aug 2003 03:52:43 -0000 1.6
@@ -429,4 +429,272 @@
</field>
</form>
</formset>
+ <formset language="ja">
+ <constant>
+ <constant-name>zip</constant-name>
+ <constant-value>^\d{3}-\d{4}$</constant-value>
+ </constant>
+ <constant>
+ <constant-name>phone</constant-name>
+
<constant-value>^[0][1-9]((\d{2,3}-?)|(-\d{2,3})|(\d-\d{1,2})|(\d{2}-\d))\d-\d{4}$</constant-value>
+ </constant>
+
+ <form name="registrationForm">
+ <field property="firstName"
+ depends="required,mask,minlength">
+ <arg0 key="registrationForm.firstname.displayname"/>
+ <arg1 name="minlength" key="${var:minlength}" resource="false"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^\w+$</var-value>
+ </var>
+ <var>
+ <var-name>minlength</var-name>
+ <var-value>5</var-value>
+ </var>
+ </field>
+ <field property="lastName"
+ depends="required,mask,maxlength">
+ <msg name="mask" key="registrationForm.lastname.maskmsg"/>
+ <arg0 key="registrationForm.lastname.displayname"/>
+ <arg1 name="maxlength" key="${var:maxlength}" resource="false"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[a-zA-Z]*$</var-value>
+ </var>
+ <var>
+ <var-name>maxlength</var-name>
+ <var-value>10</var-value>
+ </var>
+ </field>
+ <field property="addr"
+ depends="required">
+ <arg0 key="registrationForm.addr.displayname"/>
+ </field>
+ <field property="cityStateZip.city"
+ depends="required,mask">
+ <arg0 key="registrationForm.city.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[a-zA-Z]*$</var-value>
+ </var>
+ </field>
+ <field property="cityStateZip.stateProv"
+ depends="required,mask">
+ <arg0 key="registrationForm.stateprov.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[a-zA-Z]*$</var-value>
+ </var>
+ </field>
+ <field property="cityStateZip.zipPostal[1]"
+ depends="required,mask">
+ <arg0 key="registrationForm.zippostal.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>${zip}</var-value>
+ </var>
+ </field>
+ <field property="phone"
+ depends="mask">
+ <arg0 key="registrationForm.phone.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>${phone}</var-value>
+ </var>
+ </field>
+ <field property="email"
+ depends="required,email">
+ <arg0 key="registrationForm.email.displayname"/>
+ </field>
+ </form>
+ <form name="multiRegistrationForm">
+ <field property="firstName"
+ depends="required,mask"
+ page="1">
+ <arg0 key="registrationForm.firstname.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^\w+$</var-value>
+ </var>
+ </field>
+ <field property="lastName"
+ depends="required,mask"
+ page="1">
+ <msg name="mask" key="registrationForm.lastname.maskmsg"/>
+ <arg0 key="registrationForm.lastname.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[a-zA-Z]*$</var-value>
+ </var>
+ </field>
+ <field property="addr"
+ depends="required"
+ page="1">
+ <arg0 key="registrationForm.addr.displayname"/>
+ </field>
+ <field property="cityStateZip.city"
+ depends="required,mask"
+ page="1">
+ <arg0 key="registrationForm.city.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[a-zA-Z]*$</var-value>
+ </var>
+ </field>
+ <field property="cityStateZip.stateProv"
+ depends="required,mask"
+ page="2">
+ <arg0 key="registrationForm.stateprov.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[a-zA-Z]*$</var-value>
+ </var>
+ </field>
+ <field property="cityStateZip.zipPostal[1]"
+ depends="required,mask"
+ page="2">
+ <arg0 key="registrationForm.zippostal.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>${zip}</var-value>
+ </var>
+ </field>
+ <field property="phone"
+ depends="mask"
+ page="2">
+ <arg0 key="registrationForm.phone.displayname"/>
+ <var>
+ <var-name>mask</var-name>
+ <var-value>${phone}</var-value>
+ </var>
+ </field>
+ <field property="email"
+ depends="required,email"
+ page="2">
+ <arg0 key="registrationForm.email.displayname"/>
+ </field>
+ </form>
+ <form name="typeForm">
+ <field property="byte"
+ depends="required,byte">
+ <arg0 key="typeForm.byte.displayname"/>
+ </field>
+ <field property="short"
+ depends="required,short">
+ <arg0 key="typeForm.short.displayname"/>
+ </field>
+ <field property="integer"
+ depends="required,integer,intRange">
+ <arg0 key="typeForm.integer.displayname"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
+ <var>
+ <var-name>min</var-name>
+ <var-value>400</var-value>
+ </var>
+ <var>
+ <var-name>max</var-name>
+ <var-value>700</var-value>
+ </var>
+ </field>
+ <field property="long"
+ depends="required,long">
+ <arg0 key="typeForm.long.displayname"/>
+ </field>
+ <field property="float"
+ depends="required,float">
+ <arg0 key="typeForm.float.displayname"/>
+ </field>
+ <field property="floatRange"
+ depends="required,float,floatRange">
+ <arg0 key="typeForm.floatRange.displayname"/>
+ <arg1 name="floatRange" key="${var:min}" resource="false"/>
+ <arg2 name="floatRange" key="${var:max}" resource="false"/>
+ <var>
+ <var-name>min</var-name>
+ <var-value>-2.17</var-value>
+ </var>
+ <var>
+ <var-name>max</var-name>
+ <var-value>3.14</var-value>
+ </var>
+ </field>
+ <field property="double"
+ depends="required,double">
+ <arg0 key="typeForm.double.displayname"/>
+ </field>
+ <field property="date"
+ depends="required,date">
+ <arg0 key="typeForm.date.displayname"/>
+ <var>
+ <var-name>datePatternStrict</var-name>
+ <var-value>yyyy/MM/dd</var-value>
+ </var>
+ </field>
+ <field property="creditCard"
+ depends="required,creditCard">
+ <arg0 key="typeForm.creditCard.displayname"/>
+ </field>
+ <field property="value"
+ indexedListProperty="nameList"
+ depends="required">
+ <arg0 key="typeForm.nested.name.displayname"/>
+ </field>
+ </form>
+ <form name="jsTypeForm">
+ <field property="byte"
+ depends="required,byte">
+ <arg0 key="typeForm.byte.displayname"/>
+ </field>
+ <field property="short"
+ depends="required,short">
+ <arg0 key="typeForm.short.displayname"/>
+ </field>
+ <field property="integer"
+ depends="required,integer,intRange">
+ <arg0 key="typeForm.integer.displayname"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
+ <var>
+ <var-name>min</var-name>
+ <var-value>400</var-value>
+ </var>
+ <var>
+ <var-name>max</var-name>
+ <var-value>700</var-value>
+ </var>
+ </field>
+ <field property="float"
+ depends="required,float">
+ <arg0 key="typeForm.float.displayname"/>
+ </field>
+ <field property="floatRange"
+ depends="required,float,floatRange">
+ <arg0 key="typeForm.floatRange.displayname"/>
+ <arg1 name="floatRange" key="${var:min}" resource="false"/>
+ <arg2 name="floatRange" key="${var:max}" resource="false"/>
+ <var>
+ <var-name>min</var-name>
+ <var-value>-2.17</var-value>
+ </var>
+ <var>
+ <var-name>max</var-name>
+ <var-value>3.14</var-value>
+ </var>
+ </field>
+ <field property="date"
+ depends="required,date">
+ <arg0 key="typeForm.date.displayname"/>
+ <var>
+ <var-name>datePatternStrict</var-name>
+ <var-value>yyyy/MM/dd</var-value>
+ </var>
+ </field>
+ <field property="creditCard"
+ depends="required,creditCard">
+ <arg0 key="typeForm.creditCard.displayname"/>
+ </field>
+ </form>
+ </formset>
</form-validation>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
