From 64470c7357bd1253fcdae98bb14a4ca06bfd9225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Gielen?= <rgielen@apache.org>
Date: Mon, 9 Mar 2009 14:39:22 +0000
Subject: [PATCH] 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

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@751693 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/src/main/resources/globalMessages.properties      | 2 ++
 apps/showcase/src/main/resources/globalMessages_en.properties   | 0
 .../apache/struts2/showcase/action/EmployeeAction_en.properties | 0
 apps/showcase/src/main/webapp/empmanager/editEmployee.jsp       | 2 +-
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 apps/showcase/src/main/resources/globalMessages_en.properties
 create mode 100644 apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties

diff --git a/apps/showcase/src/main/resources/globalMessages.properties b/apps/showcase/src/main/resources/globalMessages.properties
index 24a39d45c..d3417f788 100644
--- a/apps/showcase/src/main/resources/globalMessages.properties
+++ b/apps/showcase/src/main/resources/globalMessages.properties
@@ -1,3 +1,5 @@
+format.number = {0,number,#0.0##}
+
 save=Save
 
 item.edit=Edit {0}
diff --git a/apps/showcase/src/main/resources/globalMessages_en.properties b/apps/showcase/src/main/resources/globalMessages_en.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp b/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
index aa77b5c52..99bd2faf2 100644
--- a/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
+++ b/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
@@ -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"