Author: vbriand Date: 2011-03-25 10:14:58 +0100 (Fri, 25 Mar 2011) New Revision: 42 Url: http://chorem.org/repositories/revision/chorem/42 Log: Added missing information in struts.xml Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-03-24 17:08:31 UTC (rev 41) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-03-25 09:14:58 UTC (rev 42) @@ -69,6 +69,9 @@ newPerson.setFirstName(firstName); newPerson.setLastName(lastName); newPerson.setEmail(email); + + //Lenient mode disabled because results may be very odd + formatter.setLenient(false); try { newPerson.setBirthDate(formatter.parse(birthDate)); } catch (ParseException e) { Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-24 17:08:31 UTC (rev 41) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-25 09:14:58 UTC (rev 42) @@ -2,13 +2,19 @@ chorem.bonzoms.company=Company {0} chorem.bonzoms.company.add=Add a new company chorem.bonzoms.company.create.error=An error occurred while creating your new company, please try again. If the problem persists, please contact an administrator -chorem.bonzoms.company.name=Company name -chorem.bonzoms.company.type=Company type +chorem.bonzoms.company.name=Company''s name +chorem.bonzoms.company.type=Company''s type chorem.bonzoms.contactDetails=Contact details chorem.bonzoms.contactDetails.add=Add a new contact details -chorem.bonzoms.contactDetails.name=Contact details name -chorem.bonzoms.contactDetails.type=Contact details type -chorem.bonzoms.contactDetails.value=Contact details value +chorem.bonzoms.contactDetails.name=Contact details'' name +chorem.bonzoms.contactDetails.type=Contact details'' type +chorem.bonzoms.contactDetails.value=Contact details'' value +chorem.bonzoms.employmentContract=Employment contract +chorem.bonzoms.employmentContract.add=Add a new employment contract +chorem.bonzoms.employmentContract.description=Description +chorem.bonzoms.employmentContract.salary=Salary +chorem.bonzoms.employmentContract.type=Type +chorem.bonzoms.employmentContract.workingTime=Working time chorem.bonzoms.home=Home chorem.bonzoms.person=Person chorem.bonzoms.person.add=Add a new person @@ -32,8 +38,8 @@ chorem.gepeto.project.create.error=An error occurred while creating your new project, please try again. If the problem persists, please contact an administrator chorem.gepeto.project.description=Description chorem.gepeto.project.description.required=You must describe the project -chorem.gepeto.project.name=Project name -chorem.gepeto.project.name.required=You must enter the project name +chorem.gepeto.project.name=Project''s name +chorem.gepeto.project.name.required=You must enter the project''s name chorem.gepeto.projectDetails.title=Details of project {0} chorem.gepeto.projectOrder=Project order chorem.gepeto.projectOrder.add=Add a new project order Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-24 17:08:31 UTC (rev 41) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-25 09:14:58 UTC (rev 42) @@ -11,6 +11,12 @@ chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact +chorem.bonzoms.employmentContract=Contrat de travail +chorem.bonzoms.employmentContract.add=Ajouter un nouveau contrat de travail +chorem.bonzoms.employmentContract.description=Description +chorem.bonzoms.employmentContract.salary=Salaire +chorem.bonzoms.employmentContract.type=Type +chorem.bonzoms.employmentContract.workingTime=Temps de travail chorem.bonzoms.home=Accueil chorem.bonzoms.person=Personne chorem.bonzoms.person.add=Ajouter une nouvelle personne @@ -19,9 +25,9 @@ chorem.bonzoms.person.create.error= chorem.bonzoms.person.email=Email chorem.bonzoms.person.email.required=Vous devez entrer l''adresse email de la personne -chorem.bonzoms.person.email.wrongFormat=L''adresse email que vous avez entrée est incorrecte +chorem.bonzoms.person.email.wrongFormat=L''adresse email que vous avez entr\u00E9e est incorrecte chorem.bonzoms.person.firstName=Pr\u00E9nom -chorem.bonzoms.person.firstName.required=Vous devez entrer le prénom de la personne +chorem.bonzoms.person.firstName.required=Vous devez entrer le pr\u00E9nom de la personne chorem.bonzoms.person.lastName=Nom chorem.bonzoms.person.lastName.required=Vous devez entrer le nom de la personne chorem.config.configFileName.description=Nom du fichier de configuration de chorem Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-24 17:08:31 UTC (rev 41) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-25 09:14:58 UTC (rev 42) @@ -14,6 +14,7 @@ </package> <package name="bonzoms" namespace="/bonzoms" extends="struts-default"> + <default-action-ref name="home" /> <action name="home"> <result>/WEB-INF/jsp/bonzoms/home.jsp</result> </action> @@ -25,9 +26,14 @@ <result name="error">/WEB-INF/jsp/bonzoms/addCompany.jsp</result> <result type="redirectAction">home</result> </action> - <action name="addPersonPage"> + <action name="addPerson_input"> <result>/WEB-INF/jsp/bonzoms/addPerson.jsp</result> </action> + <action name="addPerson" class="org.chorem.bonzoms.action.PersonAction" method="add"> + <result name="input">/WEB-INF/jsp/bonzoms/addPerson.jsp</result> + <result name="error">/WEB-INF/jsp/bonzoms/addPerson.jsp</result> + <result type="redirectAction">home</result> + </action> <action name="addContactDetails"> <result>/WEB-INF/jsp/bonzoms/addContactDetails.jsp</result> </action> @@ -57,6 +63,9 @@ <result name="error">/WEB-INF/jsp/gepeto/addTask.jsp</result> <result type="redirectAction">home</result> </action> + <action name="addProjectOrder_input"> + <result>/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> + </action> <action name="addProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="add"> <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result>