[Chorem-commits] r103 - in trunk/chorem-web/src/main: java/org/chorem/billy/action java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources/i18n

22 Apr 2011

Author: vbriand
Date: 2011-04-22 10:40:03 +0200 (Fri, 22 Apr 2011)
New Revision: 103

Url: http://chorem.org/repositories/revision/chorem/103

Log:
Replaced other messages by a more generic one

Modified:
   trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java
   trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java
   trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java
   trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java
   trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java
   trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java
   trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
   trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.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

Modified: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java
===================================================================

--- trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -209,7 +209,7 @@
             }
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.billy.quotation.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new quotation", e);
         }
         return result;

Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -170,7 +170,7 @@
             }
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.bonzoms.company.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new company", e);
         }
         return result;

Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -65,7 +65,7 @@
             proxy.store(newContactDetails);
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.bonzoms.contactDetails.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating new contact details", e);
         }
         return result;

Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -111,7 +111,7 @@
             }
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.bonzoms.employmentContract.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new employment contract", e);
         }
         return result;

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 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -137,7 +137,7 @@
             }
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.bonzoms.person.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new person", e);   
         }
         return result;

Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -149,7 +149,7 @@
             proxy.store(newProject);
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.gepeto.project.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new project", e);
         }
         return result;

Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -234,7 +234,7 @@
             }
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.gepeto.projectOrder.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new project order", e);
         }
         return result;

Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java	2011-04-22 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java	2011-04-22 08:40:03 UTC (rev 103)
@@ -141,7 +141,7 @@
             }
         } catch (Exception e) {
             result = false;
-            addActionError(getText(n_("chorem.gepeto.task.create.error")));
+            addActionError(getText(n_("chorem.create.error")));
             log.error("An error occurred while creating a new task", e);
         }
         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 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties	2011-04-22 08:40:03 UTC (rev 103)
@@ -6,7 +6,6 @@
 chorem.billy.quotation.addToProject=Add a new quotation to the project "{0}"
 chorem.billy.quotation.amount=Amount
 chorem.billy.quotation.backToProjectDetails=Get back to project
-chorem.billy.quotation.create.error=An error occurred while creating your new quotation, please try again. If the problem persists, please contact an administrator
 chorem.billy.quotation.description=Description
 chorem.billy.quotation.invalidCustomer=
 chorem.billy.quotation.invalidSupplier=
@@ -28,7 +27,6 @@
 chorem.bonzoms.company.addressLine2=Address line 2 (opt.)
 chorem.bonzoms.company.city=City
 chorem.bonzoms.company.country=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.phoneNb=Phone number (opt.)
@@ -39,7 +37,6 @@
 chorem.bonzoms.companyDetails.title=
 chorem.bonzoms.contactDetails=Contact details
 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.type=Contact details'' type
 chorem.bonzoms.contactDetails.value=Contact details'' value
@@ -54,7 +51,6 @@
 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.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.endDate=End date (dd/mm/yyyy)
 chorem.bonzoms.employmentContract.salary=Salary
@@ -70,7 +66,6 @@
 chorem.bonzoms.person.birthDate=Birth date (dd/mm/yyyy)
 chorem.bonzoms.person.city=City
 chorem.bonzoms.person.country=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.wrongFormat=The email format is invalid
 chorem.bonzoms.person.firstName=First name
@@ -78,6 +73,7 @@
 chorem.bonzoms.person.phoneNb=Phone number (opt.)
 chorem.bonzoms.person.postcode=Postcode
 chorem.config.configFileName.description=chorem''s configuration filename
+chorem.create.error=An error occurred, please try again. If the problem persists, please contact an administrator
 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
@@ -85,7 +81,6 @@
 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.name=Project''s name
 chorem.gepeto.projectDetails.noProjectOrder=
@@ -103,7 +98,6 @@
 chorem.gepeto.projectOrder.beginDate=Begin date (dd/mm/yyyy)
 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.estimatedEndDate=Estimated end date (dd/mm/yyyy)
 chorem.gepeto.projectOrder.invalidCompany=
@@ -134,7 +128,6 @@
 chorem.gepeto.task.add=Add a new task
 chorem.gepeto.task.backToProjectDetails=
 chorem.gepeto.task.beginDate=Begin date (dd/mm/yyyy)
-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.estimatedDays=Estimated days
 chorem.gepeto.task.estimatedDays.wrongFormat=The estimated days must be a positive integer

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 08:25:31 UTC (rev 102)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties	2011-04-22 08:40:03 UTC (rev 103)
@@ -6,7 +6,6 @@
 chorem.billy.quotation.addToProject=Ajouter un nouveau devis au projet "{0}"
 chorem.billy.quotation.amount=Montant
 chorem.billy.quotation.backToProjectDetails=Retourner sur le projet
-chorem.billy.quotation.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau devis, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur
 chorem.billy.quotation.customer=Client
 chorem.billy.quotation.description=Description
 chorem.billy.quotation.invalidCustomer=
@@ -29,7 +28,6 @@
 chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.)
 chorem.bonzoms.company.city=Ville
 chorem.bonzoms.company.country=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
@@ -41,7 +39,6 @@
 chorem.bonzoms.companyDetails.title=D\u00E9tails de l''entreprise "{0}"
 chorem.bonzoms.contactDetails=M\u00E9thode de contact
 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.type=Type de la m\u00E9thode de contact
 chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact
@@ -56,7 +53,6 @@
 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.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.endDate=Date de fin
 chorem.bonzoms.employmentContract.salary=Salaire
@@ -72,7 +68,6 @@
 chorem.bonzoms.person.birthDate=Date de naissance
 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.wrongFormat=L''adresse email que vous avez entr\u00E9e est incorrecte
 chorem.bonzoms.person.firstName=Pr\u00E9nom
@@ -80,6 +75,7 @@
 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.create.error=Une erreur s''est produite, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur
 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
@@ -87,7 +83,6 @@
 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.name=Nom du projet
 chorem.gepeto.projectDetails.noProjectOrder=Pas de contrat
@@ -106,7 +101,6 @@
 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.estimatedEndDate=Date de fin estim\u00E9e
 chorem.gepeto.projectOrder.invalidCompany=
@@ -139,7 +133,6 @@
 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.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.estimatedDays=Nombre de jours estim\u00E9s
 chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00E9 doit \u00EAtre un entier positif

    

[Chorem-commits] r103 - in trunk/chorem-web/src/main: java/org/chorem/billy/action java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources/i18n

vbriand＠users.chorem.org