Author: husted
Date: Mon Mar 27 16:22:41 2006
New Revision: 389327
URL: http://svn.apache.org/viewcvs?rev=389327&view=rev
Log:
Action2 Apps
* Mailreader - Work in progress
** Add support for Locale change
** Change Subscription workflow to validate edit/delete from base class. Save
is validated from subclass.
Removed:
struts/sandbox/trunk/action2/STATUS.txt
Modified:
struts/sandbox/trunk/action2/README.txt
struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate.properties
struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate_ja.properties
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources.properties
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ja.properties
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ru.properties
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
Modified: struts/sandbox/trunk/action2/README.txt
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/README.txt?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/README.txt (original)
+++ struts/sandbox/trunk/action2/README.txt Mon Mar 27 16:22:41 2006
@@ -184,7 +184,4 @@
* Need to log and present unexpected exceptions
----
-
-
-
====
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate.properties?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate.properties
(original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate.properties
Mon Mar 27 16:22:41 2006
@@ -1,3 +1,3 @@
-prompt.password=Enter your Password here ==>
+password=Enter your Password here ==>
struts.logo.path=/struts-power.gif
struts.logo.alt=Powered by Struts
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate_ja.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate_ja.properties?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate_ja.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/alternate_ja.properties
Mon Mar 27 16:22:41 2006
@@ -1 +1 @@
-prompt.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b==>
+.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b==>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/resources.properties?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/resources.properties
(original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/resources.properties
Mon Mar 27 16:22:41 2006
@@ -54,17 +54,18 @@
mainMenu.title=MailReader Demonstration Application - Main Menu
option.imap=IMAP Protocol
option.pop3=POP3 Protocol
-prompt.autoConnect=Auto Connect
-prompt.fromAddress=From Address
-prompt.fullName=Full Name
-prompt.mailHostname=Mail Server
-prompt.mailPassword=Mail Password
-prompt.mailServerType=Server Type
-prompt.mailUsername=Mail Username
-prompt.password=Password
-prompt.password2=(Repeat) Password
-prompt.replyToAddress=Reply To Address
-prompt.username=Username
+# prompt.
+autoConnect=Auto Connect
+fromAddress=From Address
+fullName=Full Name
+mailHostname=Mail Server
+mailPassword=Mail Password
+mailServerType=Server Type
+mailUsername=Mail Username
+password=Password
+password2=(Repeat) Password
+replyToAddress=Reply To Address
+username=Username
registration.addSubscription=Add
registration.deleteSubscription=Delete
registration.editSubscription=Edit
@@ -75,18 +76,18 @@
subscription.title.edit=Edit Existing Mail Subscription
# Standard error messages for validator framework checks
-errors.required={0} is required.
-errors.minlength={0} cannot be less than {1} characters.
-errors.maxlength={0} cannot be greater than {1} characters.
-errors.invalid={0} is invalid.
-errors.byte={0} must be an byte.
-errors.short={0} must be an short.
-errors.integer={0} must be an integer.
-errors.long={0} must be an long.
-errors.float={0} must be an float.
-errors.double={0} must be an double.
-errors.date={0} is not a date.
-errors.range={0} is not in the range {1} through {2}.
-errors.creditcard={0} is not a valid credit card number.
-errors.email={0} is an invalid e-mail address.
-errors.literal={0}
+errors.required=${getText(fieldName)} is required.
+errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
+errors.maxlength=${getText(fieldName)} cannot be greater than {1} characters.
+errors.invalid=${getText(fieldName)} is invalid.
+errors.byte=${getText(fieldName)} must be an byte.
+errors.short=${getText(fieldName)} must be an short.
+errors.integer=${getText(fieldName)} must be an integer.
+errors.long=${getText(fieldName)} must be an long.
+errors.float=${getText(fieldName)} must be an float.
+errors.double=${getText(fieldName)} must be an double.
+errors.date=${getText(fieldName)} is not a date.
+errors.range=${getText(fieldName)} is not in the range ${minLength} through
${maxLength}.
+errors.creditcard=${getText(fieldName)} is not a valid credit card number.
+errors.email=${getText(fieldName)} is an invalid e-mail address.
+errors.literal=${getText(fieldName)}
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ja.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ja.properties?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ja.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ja.properties
Mon Mar 27 16:22:41 2006
@@ -51,17 +51,18 @@
mainMenu.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
- \u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
option.imap=IMAP \u30d7\u30ed\u30c8\u30b3\u30eb
option.pop3=POP3 \u30d7\u30ed\u30c8\u30b3\u30eb
-prompt.autoConnect=\u81ea\u52d5\u63a5\u7d9a
-prompt.fromAddress=From\u30a2\u30c9\u30ec\u30b9
-prompt.fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
-prompt.mailHostname=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
-prompt.mailPassword=\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9
-prompt.mailServerType=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
-prompt.mailUsername=\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d
-prompt.password=\u30d1\u30b9\u30ef\u30fc\u30c9
-prompt.password2=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
-prompt.replyToAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
-prompt.username=\u30e6\u30fc\u30b6\u540d
+# prompt.
+autoConnect=\u81ea\u52d5\u63a5\u7d9a
+fromAddress=From\u30a2\u30c9\u30ec\u30b9
+fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
+mailHostname=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
+mailPassword=\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9
+mailServerType=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
+mailUsername=\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d
+.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+password2=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
+replyToAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
+username=\u30e6\u30fc\u30b6\u540d
registration.addSubscription=\u65b0\u898f\u4f5c\u6210
registration.deleteSubscription=\u524a\u9664
registration.editSubscription=\u7de8\u96c6
@@ -72,17 +73,17 @@
subscription.title.edit=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u7de8\u96c6
# Standard error messages for validator framework checks
-errors.required={0}
\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-errors.minlength={0} \u306f {1}
\u6587\u5b57\u4ee5\u4e0a\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.maxlength={0} \u306f {2}
\u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.invalid={0} \u306f\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
-errors.byte={0}
\u306fbyte\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.short={0}
\u306fshort\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.integer={0}
\u306finteger\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.long={0}
\u306flong\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.float={0}
\u306ffloat\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.double={0}
\u306fdouble\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.date={0}
\u306f\u65e5\u4ed8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-errors.range={0} \u306f {1} \u304b\u3089 {2}
\u306e\u9593\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.creditcard={0}
\u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-errors.email={0}
\u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.required=${getText(fieldName)}
\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+errors.minlength=${getText(fieldName)} \u306f {1}
\u6587\u5b57\u4ee5\u4e0a\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.maxlength=${getText(fieldName)} \u306f {2}
\u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.invalid=${getText(fieldName)}
\u306f\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.byte=${getText(fieldName)}
\u306fbyte\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.short=${getText(fieldName)}
\u306fshort\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.integer=${getText(fieldName)}
\u306finteger\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.long=${getText(fieldName)}
\u306flong\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.float=${getText(fieldName)}
\u306ffloat\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.double=${getText(fieldName)}
\u306fdouble\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.date=${getText(fieldName)}
\u306f\u65e5\u4ed8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.range=${getText(fieldName)} \u306f {1} \u304b\u3089 {2}
\u306e\u9593\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.creditcard=${getText(fieldName)}
\u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.email=${getText(fieldName)}
\u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ru.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ru.properties?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ru.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/resources_ru.properties
Mon Mar 27 16:22:41 2006
@@ -51,17 +51,18 @@
mainMenu.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435
'\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' -
\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u043c\u0435\u043d\u044e
option.imap=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b IMAP
option.pop3=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b POP3
-prompt.autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435
\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435:
-prompt.fromAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:
-prompt.fullName=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f:
-prompt.mailHostname=\u041f\u043e\u0447\u0442\u043e\u0432\u044b\u0439
\u0441\u0435\u0440\u0432\u0435\u0440:
-prompt.mailPassword=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f
\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e
\u0441\u0435\u0440\u0432\u0435\u0440\u0430:
-prompt.mailServerType=\u0422\u0438\u043f
\u0441\u0435\u0440\u0432\u0435\u0440\u0430:
-prompt.mailUsername=\u0418\u043c\u044f \u0434\u043b\u044f
\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e
\u0441\u0435\u0440\u0432\u0435\u0440\u0430:
-prompt.password=\u041f\u0430\u0440\u043e\u043b\u044c:
-prompt.password2=(\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435)
\u041f\u0430\u0440\u043e\u043b\u044c:
-prompt.replyToAddress=\u0410\u0434\u0440\u0435\u0441
\u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:
-prompt.username=\u0418\u043c\u044f:
+# prompt.
+autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435
\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435:
+fromAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:
+fullName=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f:
+mailHostname=\u041f\u043e\u0447\u0442\u043e\u0432\u044b\u0439
\u0441\u0435\u0440\u0432\u0435\u0440:
+mailPassword=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f
\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e
\u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+mailServerType=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+mailUsername=\u0418\u043c\u044f \u0434\u043b\u044f
\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e
\u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+password=\u041f\u0430\u0440\u043e\u043b\u044c:
+password2=(\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435)
\u041f\u0430\u0440\u043e\u043b\u044c:
+replyToAddress=\u0410\u0434\u0440\u0435\u0441
\u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:
+username=\u0418\u043c\u044f:
registration.addSubscription=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
registration.deleteSubscription=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
registration.editSubscription=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
@@ -72,17 +73,17 @@
subscription.title.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e
\u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
# Standard error messages for validator framework checks
-errors.required={0} is required.
-errors.minlength={0} cannot be less than {1} characters.
-errors.maxlength={0} cannot be greater than {2} characters.
-errors.invalid={0} is invalid.
-errors.byte={0} must be an byte.
-errors.short={0} must be an short.
-errors.integer={0} must be an integer.
-errors.long={0} must be an long.
-errors.float={0} must be an float.
-errors.double={0} must be an double.
-errors.date={0} is not a date.
-errors.range={0} is not in the range {1} through {2}.
-errors.creditcard={0} is not a valid credit card number.
-errors.email={0} is an invalid e-mail address.
+errors.required=${getText(fieldName)} is required.
+errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
+errors.maxlength=${getText(fieldName)} cannot be greater than {2} characters.
+errors.invalid=${getText(fieldName)} is invalid.
+errors.byte=${getText(fieldName)} must be an byte.
+errors.short=${getText(fieldName)} must be an short.
+errors.integer=${getText(fieldName)} must be an integer.
+errors.long=${getText(fieldName)} must be an long.
+errors.float=${getText(fieldName)} must be an float.
+errors.double=${getText(fieldName)} must be an double.
+errors.date=${getText(fieldName)} is not a date.
+errors.range=${getText(fieldName)} is not in the range {1} through {2}.
+errors.creditcard=${getText(fieldName)} is not a valid credit card number.
+errors.email=${getText(fieldName)} is an invalid e-mail address.
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
(original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp Mon
Mar 27 16:22:41 2006
@@ -12,9 +12,9 @@
<body>
<saf:form method="POST" validate="true">
- <saf:textfield label="%{getText('prompt.username')}" name="username"/>
+ <saf:textfield label="%{getText('username')}" name="username"/>
- <saf:textfield label="%{getText('prompt.password')}" name="password"/>
+ <saf:textfield label="%{getText('password')}" name="password"/>
<saf:submit value="%{getText('button.save')}"/>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
Mon Mar 27 16:22:41 2006
@@ -19,24 +19,24 @@
<saf:form method="POST" validate="false">
<saf:hidden name="task"/>
<saf:if test="task == 'Create'">
- <saf:textfield label="%{getText('prompt.username')}" name="username"/>
+ <saf:textfield label="%{getText('username')}" name="username"/>
</saf:if>
<saf:else>
- <saf:label label="%{getText('prompt.username')}" name="username"/>
+ <saf:label label="%{getText('username')}" name="username"/>
<saf:hidden name="username"/>
</saf:else>
- <saf:textfield label="%{getText('prompt.password')}" name="password"/>
+ <saf:textfield label="%{getText('password')}" name="password"/>
- <saf:textfield label="%{getText('prompt.password2')}" name="password2"/>
+ <saf:textfield label="%{getText('password2')}" name="password2"/>
- <saf:textfield label="%{getText('prompt.fullName')}"
+ <saf:textfield label="%{getText('fullName')}"
name="user.fullName"/>
- <saf:textfield label="%{getText('prompt.fromAddress')}"
+ <saf:textfield label="%{getText('fromAddress')}"
name="user.fromAddress"/>
- <saf:textfield label="%{getText('prompt.replyToAddress')}"
+ <saf:textfield label="%{getText('replyToAddress')}"
name="user.replyToAddress"/>
<saf:submit value="%{getText('button.save')}"/>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp?rev=389327&r1=389326&r2=389327&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
Mon Mar 27 16:22:41 2006
@@ -20,35 +20,35 @@
<body>
<saf:form method="POST" action="SubscriptionSave" validate="true">
<saf:hidden name="task"/>
- <saf:label label="%{getText('prompt.username')}" name="user.username"/>
+ <saf:label label="%{getText('username')}" name="user.username"/>
<saf:if test="task == 'Create'">
- <saf:textfield label="%{getText('prompt.mailHostname')}" name="host"/>
+ <saf:textfield label="%{getText('mailHostname')}" name="host"/>
</saf:if>
<saf:else>
- <saf:label label="%{getText('prompt.mailHostname')}" name="host"/>
+ <saf:label label="%{getText('mailHostname')}" name="host"/>
<saf:hidden name="host"/>
</saf:else>
<saf:if test="task == 'Delete'">
- <saf:label label="%{getText('prompt.mailUsername')}"
+ <saf:label label="%{getText('mailUsername')}"
name="subscription.username"/>
- <saf:label label="%{getText('prompt.mailPassword')}"
+ <saf:label label="%{getText('mailPassword')}"
name="subscription.password"/>
- <saf:label label="%{getText('prompt.mailServerType')}"
+ <saf:label label="%{getText('mailServerType')}"
name="subscription.type"/>
- <saf:label label="%{getText('prompt.autoConnect')}"
+ <saf:label label="%{getText('autoConnect')}"
name="subscription.autoConnect"/>
<saf:submit value="%{getText('button.confirm')}"/>
</saf:if>
<saf:else>
- <saf:textfield label="%{getText('prompt.mailUsername')}"
+ <saf:textfield label="%{getText('mailUsername')}"
name="subscription.username"/>
- <saf:textfield label="%{getText('prompt.mailPassword')}"
+ <saf:textfield label="%{getText('mailPassword')}"
name="subscription.password"/>
- <saf:select label="%{getText('prompt.mailServerType')}"
+ <saf:select label="%{getText('mailServerType')}"
name="subscription.type" list="types"/>
- <saf:checkbox label="%{getText('prompt.autoConnect')}"
+ <saf:checkbox label="%{getText('autoConnect')}"
name="subscription.autoConnect"/>
<saf:submit value="%{getText('button.save')}"/>
<saf:reset value="%{getText('button.reset')}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
