Author: rgielen
Date: Mon Mar 9 14:39:22 2009
New Revision: 751693
URL: http://svn.apache.org/viewvc?rev=751693&view=rev
Log:
WW-3028:
- fix CRUD showcase example misses localized form data for Double value
- fix missing en Resourcebundles, keeping de_* users setting Browser locale to
en_* to see English messages
Added:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties
(contents, props changed)
- copied, changed from r751632,
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
(contents, props changed)
- copied, changed from r751632,
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction.properties
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties
struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties?rev=751693&r1=751692&r2=751693&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties
Mon Mar 9 14:39:22 2009
@@ -1,3 +1,5 @@
+format.number = {0,number,#0.0##}
+
save=Save
item.edit=Edit {0}
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties
(from r751632,
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties?p2=struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties&p1=struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties&r1=751632&r2=751693&rev=751693&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages.properties
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties
Mon Mar 9 14:39:22 2009
@@ -1,7 +0,0 @@
-save=Save
-
-item.edit=Edit {0}
-item.create=Create {0}
-item.list={0} List
-
-token.transfer.time=The bank transfer was executed at {0,date,HH:mm:ss
MM-dd-yyyy}
Propchange:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
struts/struts2/trunk/apps/showcase/src/main/resources/globalMessages_en.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
(from r751632,
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction.properties)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties?p2=struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties&p1=struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction.properties&r1=751632&r2=751693&rev=751693&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction.properties
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
Mon Mar 9 14:39:22 2009
@@ -1,9 +0,0 @@
-employee=Employee
-employee.firstName=First Name
-employee.lastName=Last Name
-employee.description=Description
-
-employee.id.required=Id is required
-employee.lastName.required=Last Name is required
-employee.birthDate.required=Birthdate is required
-employee.backtolist=Back to Employee List
Propchange:
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp?rev=751693&r1=751692&r2=751693&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
Mon Mar 9 14:39:22 2009
@@ -26,7 +26,7 @@
<s:textfield label="%{getText('employee.firstName')}"
name="currentEmployee.firstName"/>
<s:textfield label="%{getText('employee.lastName')}"
name="currentEmployee.lastName"/>
<sx:datetimepicker label="Birthdate" name="currentEmployee.birthDate"/>
- <s:textfield label="Salary" name="currentEmployee.salary"/>
+ <s:textfield label="Salary" name="currentEmployee.salary"
value="%{getText('format.number',{currentEmployee.salary})}" />
<s:checkbox fieldValue="true" label="Married"
name="currentEmployee.married"/>
<s:combobox list="availablePositions" label="Position"
name="currentEmployee.position"/>
<s:select list="#skillAction.availableItems" listKey="name" label="Main
Skill"
