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 3ec2be251d1ad48492c45fbb364eb6f1bf9569e4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Feb 9 14:15:55 2015 +0100 Modifier titre de l'axe y dans synthèse scléro (termine #6623) --- .../java/fr/ifremer/wao/services/service/SynthesisService.java | 8 +++++++- .../src/main/resources/i18n/wao-services_en_GB.properties | 1 + .../src/main/resources/i18n/wao-services_fr_FR.properties | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java index e22b9f5..5b0c036 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java @@ -265,7 +265,13 @@ public class SynthesisService extends WaoServiceSupport { // Axises CategoryAxis categoryAxis = new CategoryAxis(""); - ValueAxis valueAxis = new NumberAxis(I18n.l(locale, "wao.synthesis.observationsCount")); + String valueAxisLabel; + if (obsProgram.isSclerochronology()) { + valueAxisLabel = I18n.l(locale, "wao.synthesis.observationsCount.sclerochronology"); + } else { + valueAxisLabel = I18n.l(locale, "wao.synthesis.observationsCount"); + } + ValueAxis valueAxis = new NumberAxis(valueAxisLabel); valueAxis.setUpperMargin(0.15); // Renderer for Category 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 ba0265b..6d598d1 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 @@ -111,6 +111,7 @@ wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_PIIII" wao.synthesis.estimated=Estimated wao.synthesis.observationsCount=Observations count +wao.synthesis.observationsCount.sclerochronology=Samples count wao.synthesis.planned=Planned wao.ui.chart.numberBoats=Number of boats wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x boardings 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 d0810c4..f96e5d8 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 @@ -109,6 +109,7 @@ wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucu wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_PIIII" wao.synthesis.estimated=Estimé wao.synthesis.observationsCount=Nombre d'observations +wao.synthesis.observationsCount.sclerochronology=Nombre de prélèvements wao.synthesis.planned=Planifié wao.ui.chart.numberBoats=Nombre de navires wao.ui.chart.numberOfBoatsWithBoardings=Nombres de navires avec x embarquements -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.