branch develop updated (16e03e3 -> f97f22e)
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 16e03e3 Correction de divers problèmes suite à l'introduction des laboratoires (refs #2262, fixes #6272) new f97f22e Ajout d'une valeur i18n manquante The 1 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 f97f22eeab729a723a81f0ea439fbc901b480f93 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 11 15:27:41 2014 +0100 Ajout d'une valeur i18n manquante Summary of changes: wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + .../main/webapp/WEB-INF/content/administration/edit-laboratory.jsp | 4 ++-- 3 files changed, 4 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 f97f22eeab729a723a81f0ea439fbc901b480f93 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 11 15:27:41 2014 +0100 Ajout d'une valeur i18n manquante --- wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + .../main/webapp/WEB-INF/content/administration/edit-laboratory.jsp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index aa20479..da6df47 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -325,6 +325,7 @@ wao.ui.form.Contact.error.observedDataControlToCorrectionAsked=Observed data con wao.ui.form.Contact.error.transmissionDateBeforeDataInputDate=Transmission date must be after data input date wao.ui.form.Contact.error.unwantedContactStateMotif=Contact state motif should not be provided wao.ui.form.Laboratory.title.creation=Create a laboratory +wao.ui.form.Laboratory.title.edition=Edit laboratory %s wao.ui.form.Organisation.error.nameMustBeUnique=Company name must be unique wao.ui.form.SampleRow.boatsDescription=This field contains registration numbers of the ships that areeligible for this ligne. You can use any separator to separate numbers (space, dot, line-return, comma) wao.ui.form.SampleRow.error.codeMustBeUnique=Sample row code must be unique diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index b0cd8d3..5f60f26 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -326,6 +326,7 @@ wao.ui.form.Contact.error.observedDataControlToCorrectionAsked=Un contact ne peu wao.ui.form.Contact.error.transmissionDateBeforeDataInputDate=Il faut que la date de transmission de la restitution soit après la date de saisie des données wao.ui.form.Contact.error.unwantedContactStateMotif=Il ne faut pas préciser de motif de refus wao.ui.form.Laboratory.title.creation=Création d'un laboratoire +wao.ui.form.Laboratory.title.edition=Modification du laboratoire %s wao.ui.form.Organisation.error.nameMustBeUnique=Le nom de la société doit être unique wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont éligibles pour cette ligne. Vous pouvez utiliser n'importe quel séparateur pour séparer les immatriculations (virgule, point, espace ou saut de ligne) wao.ui.form.SampleRow.error.codeMustBeUnique=Le code de la ligne doit être unique diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp index a6968f1..a4ea888 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp @@ -28,7 +28,7 @@ <s:text name="wao.ui.form.Laboratory.title.creation" /> </s:if> <s:else> - <s:property value="%{t('wao.ui.form.Laboratory.title.edition', laboratory.name)}" /> + <s:property value="%{getText('wao.ui.form.Laboratory.title.edition', laboratory.name)}" /> </s:else> </title> <content tag="mainClass">form</content> @@ -41,7 +41,7 @@ <s:text name="wao.ui.form.Laboratory.title.creation" /> </s:if> <s:else> - <s:property value="%{t('wao.ui.form.Laboratory.title.edition', laboratory.name)}" /> + <s:property value="%{getText('wao.ui.form.Laboratory.title.edition', laboratory.name)}" /> </s:else> </h1> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm