r102 - in trunk/chorem-web/src/main: java/org/chorem/bonzoms/action resources/i18n resources/org/chorem/billy/action resources/org/chorem/bonzoms/action resources/org/chorem/gepeto/action
Author: vbriand Date: 2011-04-22 10:25:31 +0200 (Fri, 22 Apr 2011) New Revision: 102 Url: http://chorem.org/repositories/revision/chorem/102 Log: Replaced specific i18n messages when a field is required by a generic one so no time is lost on translating every message 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/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.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-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-22 08:25:31 UTC (rev 102) @@ -201,8 +201,14 @@ } else { result = false; - addActionError(getText( - n_("chorem.bonzoms.employee.required"))); + if (employeeDiploma.isEmpty()) { + addFieldError("employeeDiploma", + getText(n_("chorem.field.required"))); + } + if (employeePaidLeave.isEmpty()) { + addFieldError("employeePaidLeave", + getText(n_("chorem.field.required"))); + } } } return result; 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-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-22 08:25:31 UTC (rev 102) @@ -25,21 +25,15 @@ chorem.bonzoms.company.add=Add a new company chorem.bonzoms.company.address= chorem.bonzoms.company.addressLine1=Address -chorem.bonzoms.company.addressLine1.required=You must enter the first address line chorem.bonzoms.company.addressLine2=Address line 2 (opt.) chorem.bonzoms.company.city=City -chorem.bonzoms.company.city.required=You must enter the city chorem.bonzoms.company.country=Country -chorem.bonzoms.company.country.required=You must enter the country 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.list= chorem.bonzoms.company.name=Company''s name -chorem.bonzoms.company.name.required=You must enter the company''s name chorem.bonzoms.company.phoneNb=Phone number (opt.) chorem.bonzoms.company.postcode=Postcode -chorem.bonzoms.company.postcode.required=You must enter the postcode chorem.bonzoms.company.type=Company''s type -chorem.bonzoms.company.type.required=You must enter the company''s type chorem.bonzoms.company.website=Website (opt.) chorem.bonzoms.companyDetails.name= chorem.bonzoms.companyDetails.title= @@ -47,72 +41,53 @@ chorem.bonzoms.contactDetails.add=Add a new contact details chorem.bonzoms.contactDetails.create.error=An error occurred while creating your new contact details, please try again. If the problem persists, please contact an administrator chorem.bonzoms.contactDetails.name=Contact details'' name -chorem.bonzoms.contactDetails.name.required=You must enter the contact details'' name chorem.bonzoms.contactDetails.type=Contact details'' type -chorem.bonzoms.contactDetails.type.required=You must enter the contact details'' type chorem.bonzoms.contactDetails.value=Contact details'' value -chorem.bonzoms.contactDetails.value.required=You must enter the contact details'' value chorem.bonzoms.employee= chorem.bonzoms.employee.diploma= chorem.bonzoms.employee.invalidCompany= chorem.bonzoms.employee.paidLeave= chorem.bonzoms.employee.paidLeave.wrongFormat= -chorem.bonzoms.employee.required= chorem.bonzoms.employee.rtt= chorem.bonzoms.employee.rtt.wrongFormat= chorem.bonzoms.employmentContract=Employment contract chorem.bonzoms.employmentContract.add=Add a new employment contract chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Begin date (dd/mm/yyyy) -chorem.bonzoms.employmentContract.beginDate.required=You must enter the employment contract''s begin date chorem.bonzoms.employmentContract.create.error=An error occurred while creating your new employment contract, please try again. If the problem persists, please contact an administrator chorem.bonzoms.employmentContract.description=Description -chorem.bonzoms.employmentContract.description.required=You must enter the employment contract''s description chorem.bonzoms.employmentContract.endDate=End date (dd/mm/yyyy) chorem.bonzoms.employmentContract.salary=Salary -chorem.bonzoms.employmentContract.salary.required=You must enter the employee''s salary chorem.bonzoms.employmentContract.salary.wrongFormat=The salary must be a positive integer or floating point number (the decimal mark may be either a dot or a comma) chorem.bonzoms.employmentContract.type=Type -chorem.bonzoms.employmentContract.type.required=You must enter the employment contract''s type chorem.bonzoms.employmentContract.workingTime=Working time -chorem.bonzoms.employmentContract.workingTime.required=You must enter the employee''s working time chorem.bonzoms.employmentContract.workingTime.wrongFormat=The working time must be a positive integer chorem.bonzoms.home=Home chorem.bonzoms.person=Person chorem.bonzoms.person.add=Add a new person chorem.bonzoms.person.addressLine1=Address -chorem.bonzoms.person.addressLine1.required=You must enter the first address line chorem.bonzoms.person.addressLine2=Address line 2 (opt.) chorem.bonzoms.person.birthDate=Birth date (dd/mm/yyyy) -chorem.bonzoms.person.birthDate.required=You must enter the person''s birth date chorem.bonzoms.person.city=City -chorem.bonzoms.person.city.required=You must enter the city chorem.bonzoms.person.country=Country -chorem.bonzoms.person.country.required=You must enter the country chorem.bonzoms.person.create.error=An error occurred while adding the person, please try again. If the problem persists, please contact an administrator chorem.bonzoms.person.email=Email -chorem.bonzoms.person.email.required=You must enter the person''s email chorem.bonzoms.person.email.wrongFormat=The email format is invalid chorem.bonzoms.person.firstName=First name -chorem.bonzoms.person.firstName.required=You must enter the person''s first name chorem.bonzoms.person.lastName=Last name -chorem.bonzoms.person.lastName.required=You must enter the person''s last name chorem.bonzoms.person.phoneNb=Phone number (opt.) chorem.bonzoms.person.postcode=Postcode -chorem.bonzoms.person.postcode.required=You must enter the postcode chorem.config.configFileName.description=chorem''s configuration filename chorem.date.wrongFormat=The date must be in the following format \: dd/mm/yyyy chorem.endDate.afterBegin=The end date cannot be posterior to the begin date chorem.error.internal=An internal error occurred -chorem.field.mandatory=You must fill in this field +chorem.field.required=You must fill in this field chorem.gepeto.home=Home chorem.gepeto.project=Project {0} chorem.gepeto.project.add=New project 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''s name -chorem.gepeto.project.name.required=You must enter the project''s name chorem.gepeto.projectDetails.noProjectOrder= chorem.gepeto.projectDetails.noQuotations=No quotations chorem.gepeto.projectDetails.projectOrder= @@ -126,18 +101,14 @@ chorem.gepeto.projectOrder.addToQuotation=Add a new project order to the quotation \#{0} chorem.gepeto.projectOrder.backToQuotationDetails=Get back to the quotation chorem.gepeto.projectOrder.beginDate=Begin date (dd/mm/yyyy) -chorem.gepeto.projectOrder.beginDate.required=You must provide a begin date for this project order chorem.gepeto.projectOrder.company.name= chorem.gepeto.projectOrder.company.type= chorem.gepeto.projectOrder.create.error=An error occurred while creating your new project order, please try again. If the problem persists, please contact an administrator chorem.gepeto.projectOrder.description=Description -chorem.gepeto.projectOrder.description.required=You must describe the project order chorem.gepeto.projectOrder.estimatedEndDate=Estimated end date (dd/mm/yyyy) -chorem.gepeto.projectOrder.estimatedEndDate.required=You must enter the estimated end date for this project order chorem.gepeto.projectOrder.invalidCompany= chorem.gepeto.projectOrder.status= chorem.gepeto.projectOrder.type=Type -chorem.gepeto.projectOrder.type.required=You must specify the project order''s type chorem.gepeto.projectOrderDetails.beginDate= chorem.gepeto.projectOrderDetails.companyName= chorem.gepeto.projectOrderDetails.endDate= @@ -163,19 +134,13 @@ chorem.gepeto.task.add=Add a new task chorem.gepeto.task.backToProjectDetails= chorem.gepeto.task.beginDate=Begin date (dd/mm/yyyy) -chorem.gepeto.task.beginDate.required=You must enter the begin date for this task chorem.gepeto.task.create.error=An error occurred while creating your new task, please try again. If the problem persists, please contact an administrator chorem.gepeto.task.description=Description -chorem.gepeto.task.description.required=You must describe the task chorem.gepeto.task.estimatedDays=Estimated days -chorem.gepeto.task.estimatedDays.required=You must enter the estimated number of days for this task chorem.gepeto.task.estimatedDays.wrongFormat=The estimated days must be a positive integer chorem.gepeto.task.estimatedEndDate=Estimated end date (dd/mm/yyyy) -chorem.gepeto.task.estimatedEndDate.required=You must enter the estimated end date for this task chorem.gepeto.task.name=Task name -chorem.gepeto.task.name.required=You must enter the task''s name chorem.gepeto.task.price=Price -chorem.gepeto.task.price.required=You must enter the task''s price chorem.gepeto.task.price.wrongFormat=The price must be a positive integer or floating point number (the decimal mark may be either a dot or a comma) chorem.gepeto.tasksList= chorem.home=Home 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-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-22 08:25:31 UTC (rev 102) @@ -26,22 +26,16 @@ chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 chorem.bonzoms.company.address=Adresse chorem.bonzoms.company.addressLine1=Adresse -chorem.bonzoms.company.addressLine1.required=Vous devez donner l'adresse de l''entreprise chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.) chorem.bonzoms.company.city=Ville -chorem.bonzoms.company.city.required=Vous devez renseigner la ville chorem.bonzoms.company.country=Pays -chorem.bonzoms.company.country.required=Vous devez indiquer le pays chorem.bonzoms.company.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle soci\u00E9t\u00E9, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.company.employees=Liste des employ\u00E9s chorem.bonzoms.company.list=Obtenir la liste des soci\u00E9t\u00E9s chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 -chorem.bonzoms.company.name.required=Vous devez entrer le nom de la soci\u00E9t\u00E9 chorem.bonzoms.company.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.company.postcode=Code postal -chorem.bonzoms.company.postcode.required=Vous devez renseigner le code postal de la soci\u00E9t\u00E9 chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9 -chorem.bonzoms.company.type.required=Vous devez entrer le type de la soci\u00E9t\u00E9 chorem.bonzoms.company.website=Site internet (opt.) chorem.bonzoms.companyDetails.name=Entreprise "{0}" chorem.bonzoms.companyDetails.title=D\u00E9tails de l''entreprise "{0}" @@ -49,35 +43,26 @@ chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00E9thode de contact chorem.bonzoms.contactDetails.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle m\u00E9thode de contact, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact -chorem.bonzoms.contactDetails.name.required=Vous devez indiquer le nom de la m\u00E9thode de contact chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact -chorem.bonzoms.contactDetails.type.required=Vous devez saisir le type de la m\u00E9thode de contact chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact -chorem.bonzoms.contactDetails.value.required=Vous devez entrer la valeur de la m\u00E9thode de contact chorem.bonzoms.employee=Employ\u00E9 chorem.bonzoms.employee.diploma=Dipl\u00F4me (opt.) chorem.bonzoms.employee.invalidCompany= chorem.bonzoms.employee.paidLeave=Cong\u00E9s pay\u00E9s chorem.bonzoms.employee.paidLeave.wrongFormat=Les cong\u00E9s pay\u00E9s doivent \u00EAtre \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif -chorem.bonzoms.employee.required=Vous devez remplir le nombre de cong\u00E9s pay\u00E9s et les RTT chorem.bonzoms.employee.rtt=RTT chorem.bonzoms.employee.rtt.wrongFormat=Les RTT doivent \u00EAtre \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif chorem.bonzoms.employmentContract=Contrat de travail chorem.bonzoms.employmentContract.add=Ajouter un nouveau contrat de travail chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Date de d\u00E9but -chorem.bonzoms.employmentContract.beginDate.required=Vous devez renseigner la date de d\u00E9but du contrat de travail chorem.bonzoms.employmentContract.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de travail, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.employmentContract.description=Description -chorem.bonzoms.employmentContract.description.required=Vous devez d\u00E9crire le contrat de travail chorem.bonzoms.employmentContract.endDate=Date de fin chorem.bonzoms.employmentContract.salary=Salaire -chorem.bonzoms.employmentContract.salary.required=Vous devez entrer le salaire de l'employ\u00E9 chorem.bonzoms.employmentContract.salary.wrongFormat=Le salaire doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.bonzoms.employmentContract.type=Type -chorem.bonzoms.employmentContract.type.required=Vous devez sp\u00E9cifier le type du contrat de travail chorem.bonzoms.employmentContract.workingTime=Temps de travail -chorem.bonzoms.employmentContract.workingTime.required=Vous devez saisir le temps de travail de l'employ\u00E9 chorem.bonzoms.employmentContract.workingTime.wrongFormat=Le temps de travail doit \u00EAtre un entier positif chorem.bonzoms.home=Accueil chorem.bonzoms.person=Personne @@ -85,32 +70,26 @@ chorem.bonzoms.person.addressLine1=Adresse chorem.bonzoms.person.addressLine2=Adresse ligne 2 (opt.) chorem.bonzoms.person.birthDate=Date de naissance -chorem.bonzoms.person.birthDate.required=Vous devez entrer la date de naissance de la personne chorem.bonzoms.person.city=Ville chorem.bonzoms.person.country=Pays chorem.bonzoms.person.create.error=Une erreur s''est produite lors de l''ajout de la personne, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur 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\u00E9e est incorrecte chorem.bonzoms.person.firstName=Pr\u00E9nom -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.bonzoms.person.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.person.postcode=Code postal chorem.config.configFileName.description=Nom du fichier de configuration de chorem chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00EAtre ant\u00E9rieure \u00E0 la date de d\u00E9but chorem.error.internal=Une erreur interne s''est produite -chorem.field.mandatory=Vous devez remplir ce champ +chorem.field.required=Vous devez remplir ce champ chorem.gepeto.home=Accueil chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Nouveau projet chorem.gepeto.project.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.project.description=Description -chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet chorem.gepeto.project.name=Nom du projet -chorem.gepeto.project.name.required=Vous devez renseigner un nom pour le projet chorem.gepeto.projectDetails.noProjectOrder=Pas de contrat chorem.gepeto.projectDetails.noQuotations=Pas de devis chorem.gepeto.projectDetails.projectOrder=Contrat du {0} au {1} @@ -124,19 +103,15 @@ chorem.gepeto.projectOrder.addToQuotation=Lier un nouveau contrat au devis \#{0} chorem.gepeto.projectOrder.backToQuotationDetails=Retourner sur le devis chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but -chorem.gepeto.projectOrder.beginDate.required=Vous devez renseigner une date de d\u00E9but pour le contrat chorem.gepeto.projectOrder.company=Entreprise chorem.gepeto.projectOrder.company.name= chorem.gepeto.projectOrder.company.type= chorem.gepeto.projectOrder.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.projectOrder.description=Description -chorem.gepeto.projectOrder.description.required=Vous devez d\u00E9crire le contrat chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e -chorem.gepeto.projectOrder.estimatedEndDate.required=Vous devez renseigner la date de fin estim\u00E9e du contrat chorem.gepeto.projectOrder.invalidCompany= chorem.gepeto.projectOrder.status=Statut chorem.gepeto.projectOrder.type=Type -chorem.gepeto.projectOrder.type.required=Vous devez sp\u00E9cifier le type du contrat chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00E9but \: {0} chorem.gepeto.projectOrderDetails.companyName=Nom de la soci\u00E9t\u00E9 \: {0} chorem.gepeto.projectOrderDetails.endDate=Date de fin \: {0} @@ -164,19 +139,13 @@ chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che chorem.gepeto.task.backToProjectDetails=Retourner sur le contrat chorem.gepeto.task.beginDate=Date de d\u00E9but -chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che chorem.gepeto.task.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle t\u00E2che, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.task.description=Description -chorem.gepeto.task.description.required=Vous devez d\u00E9crire la t\u00E2che chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s -chorem.gepeto.task.estimatedDays.required=Vous devez renseigner le nombre de jours estim\u00E9s chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00E9 doit \u00EAtre un entier positif chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e -chorem.gepeto.task.estimatedEndDate.required=Vous devez renseigner la date de fin de la t\u00E2che chorem.gepeto.task.name=Nom de la t\u00E2che -chorem.gepeto.task.name.required=Vous devez donner un nom \u00E0 cette t\u00E2che chorem.gepeto.task.price=Prix -chorem.gepeto.task.price.required=Vous devez donner un prix \u00E0 cette t\u00E2che chorem.gepeto.task.price.wrongFormat=Le prix doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.gepeto.tasksList= chorem.home=Accueil Modified: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="reference"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.reference.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="amount"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.amount.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -24,7 +24,7 @@ </field> <field name="vta"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.vta.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -33,7 +33,7 @@ </field> <field name="postedDate"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.postedDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,32 +5,32 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="addressLine1"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.addressLine1.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="postcode"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.postcode.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="city"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.city.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="country"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.country.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.contactDetails.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.contactDetails.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="value"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.contactDetails.value.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="salary"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.salary.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -24,7 +24,7 @@ </field> <field name="workingTime"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.workingTime.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)]]></param> @@ -33,7 +33,7 @@ </field> <field name="beginDate"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.beginDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="firstName"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.firstName.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="lastName"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.lastName.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="email"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.email.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="email"> <message key="chorem.bonzoms.person.email.wrongFormat" /> @@ -23,27 +23,27 @@ </field> <field name="birthDate"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.birthDate.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="addressLine1"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.addressLine1.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="postcode"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.postcode.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="city"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.city.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="country"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.country.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,12 +5,12 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.project.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.project.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,22 +5,22 @@ <validators> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="status"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.status.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="beginDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.beginDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> @@ -29,7 +29,7 @@ </field> <field name="estimatedEndDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.estimatedEndDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="price"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.price.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -24,7 +24,7 @@ </field> <field name="estimatedDays"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.estimatedDays.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)]]></param> @@ -33,7 +33,7 @@ </field> <field name="beginDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.beginDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> @@ -42,7 +42,7 @@ </field> <field name="estimatedEndDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.estimatedEndDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
participants (1)
-
vbriand＠users.chorem.org