[wao] branch develop updated (8caade5 -> b777525)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 8caade5 Correction du calcul des jours de mers dans le plan ObsMer : on répartit bien tous les jours du contact dans le plan (fixes #6050) new 9c03a08 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) new b777525 Fusion de la branche 6049 dans develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b777525ada3c6141bc540f104c736a7da981322b Merge: 8caade5 9c03a08 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:16:54 2014 +0100 Fusion de la branche 6049 dans develop pour expliquer en quoi cette fusion est commit 9c03a08ebda665c38dc3dbe78231633f9a07793a Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:13:37 2014 +0100 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) Summary of changes: wao-services/src/main/resources/i18n/wao-services_en_GB.properties | 2 +- wao-services/src/main/resources/i18n/wao-services_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 9c03a08ebda665c38dc3dbe78231633f9a07793a Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:13:37 2014 +0100 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) --- wao-services/src/main/resources/i18n/wao-services_en_GB.properties | 2 +- wao-services/src/main/resources/i18n/wao-services_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wao-services/src/main/resources/i18n/wao-services_en_GB.properties b/wao-services/src/main/resources/i18n/wao-services_en_GB.properties index 1daefb6..41b794c 100644 --- a/wao-services/src/main/resources/i18n/wao-services_en_GB.properties +++ b/wao-services/src/main/resources/i18n/wao-services_en_GB.properties @@ -28,7 +28,7 @@ wao.business.validationState.standby=Stand by wao.business.validationState.validated=validate wao.email.addBoatToUserAllegroWallet.contactDone=This demand is for observation expected done between %s and %s wao.email.addBoatToUserAllegroWallet.contactExpected=This demand is for observation expected on %s -wao.email.addBoatToUserAllegroWallet.subject=%s\: add boat %d to ALLEGRO wallet for user %s +wao.email.addBoatToUserAllegroWallet.subject=%s\: add boat %s to ALLEGRO wallet for user %s wao.import.boat.failure.invalid.locationCode=The code '%s' is not a valid location code wao.import.boat.failure.missing.port=The port is required wao.import.contact.failure.boatMissing=You need to precise the plate number of the boat associated to the contact diff --git a/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties b/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties index 1c2cfe2..a4dc317 100644 --- a/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties +++ b/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties @@ -27,7 +27,7 @@ wao.business.validationState.standby=En attente wao.business.validationState.validated=Validé wao.email.addBoatToUserAllegroWallet.contactDone=Cette demande émane de l'observation réalisée entre le %s et le %s. wao.email.addBoatToUserAllegroWallet.contactExpected=Cette demande émane de l'observation prévue le %s. -wao.email.addBoatToUserAllegroWallet.subject=%s \: ajout navire %d sur portefeuille ALLEGRO de %s +wao.email.addBoatToUserAllegroWallet.subject=%s \: ajout navire %s sur portefeuille ALLEGRO de %s wao.export.ical.desc=avec %s wao.import.boat.failure.invalid.locationCode=Le code '%s' n'est pas un code de lieu valide wao.import.boat.failure.missing.port=Il faut préciser un port -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit b777525ada3c6141bc540f104c736a7da981322b Merge: 8caade5 9c03a08 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:16:54 2014 +0100 Fusion de la branche 6049 dans develop pour expliquer en quoi cette fusion est wao-services/src/main/resources/i18n/wao-services_en_GB.properties | 2 +- wao-services/src/main/resources/i18n/wao-services_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm