Mercurial > dive4elements > river

changeset 4257:1dfe3e1d304e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added i18n strings for historical discharge wq chart.
author Ingo Weinzierl <weinzierl.ingo@googlemail.com>
date Thu, 25 Oct 2012 15:00:11 +0200
parents 9a1a3406deb5
children 2c6e571f366a
files flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeWQCurveGenerator.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties
diffstat 5 files changed, 18 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeWQCurveGenerator.java	Thu Oct 25 14:02:39 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeWQCurveGenerator.java	Thu Oct 25 15:00:11 2012 +0200
@@ -31,8 +31,6 @@
 
     public static final String I18N_YAXIS_LABEL = "chart.historical.discharge.wq.yaxis.label";
 
-    public static final String I18N_YAXIS_SECOND_LABEL = "chart.historical.discharge.wq.yaxis.second.label";
-
     public static enum YAXIS {
         W(0);
 
@@ -87,9 +85,6 @@
         if (pos == 0) {
             return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL);
         }
-        else if (pos == 1) {
-            return msg(I18N_YAXIS_SECOND_LABEL, I18N_YAXIS_SECOND_LABEL);
-        }
         else {
             return "NO TITLE FOR Y AXIS: " + pos;
         }
@@ -145,8 +140,8 @@
         // addAxisDataset(series, YAXIS.W.idx, visible);
     }
 
-    protected void doHistoricalDischargeCurveOut(FLYSArtifact artifact, Object data,
-        String desc, Document theme, boolean visible) {
+    protected void doHistoricalDischargeCurveOut(FLYSArtifact artifact,
+        Object data, String desc, Document theme, boolean visible) {
         XYSeries series = new StyledXYSeries(desc, theme);
         StyledSeriesBuilder.addPointsQW(series, (WQKms) data);
 
--- a/flys-artifacts/src/main/resources/messages.properties	Thu Oct 25 14:02:39 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages.properties	Thu Oct 25 15:00:11 2012 +0200
@@ -162,6 +162,10 @@
 chart.historical.discharge.xaxis.label = Time
 chart.historical.discharge.yaxis.label = Q [m\u00b3/s]
 chart.historical.discharge.yaxis.second.label = W [cm]
+chart.historical.discharge.wq.title = Discharge Curves
+chart.historical.discharge.wq.subtitle = Gauge {0}
+chart.historical.discharge.wq.xaxis.label = Q [m\u00b3/s]
+chart.historical.discharge.wq.yaxis.label = W [cm]
 
 chart.reference.curve.title = Reference Curve
 chart.reference.curve.subtitle = {0}
--- a/flys-artifacts/src/main/resources/messages_de.properties	Thu Oct 25 14:02:39 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Thu Oct 25 15:00:11 2012 +0200
@@ -161,6 +161,10 @@
 chart.historical.discharge.xaxis.label = Zeit
 chart.historical.discharge.yaxis.label = Q [m\u00b3/s]
 chart.historical.discharge.yaxis.second.label = W [cm]
+chart.historical.discharge.wq.title = Abflusskurven
+chart.historical.discharge.wq.subtitle = Pegel {0}
+chart.historical.discharge.wq.xaxis.label = Q [m\u00b3/s]
+chart.historical.discharge.wq.yaxis.label = W [cm]
 
 chart.reference.curve.title = Bezugslinie
 chart.reference.curve.subtitle = {0}
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Oct 25 14:02:39 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Oct 25 15:00:11 2012 +0200
@@ -161,6 +161,10 @@
 chart.historical.discharge.xaxis.label = Zeit
 chart.historical.discharge.yaxis.label = Q [m\u00b3/s]
 chart.historical.discharge.yaxis.second.label = W [cm]
+chart.historical.discharge.wq.title = Abflusskurven
+chart.historical.discharge.wq.subtitle = Pegel {0}
+chart.historical.discharge.wq.xaxis.label = Q [m\u00b3/s]
+chart.historical.discharge.wq.yaxis.label = W [cm]
 
 chart.reference.curve.title = Bezugslinie
 chart.reference.curve.subtitle = {0}
--- a/flys-artifacts/src/main/resources/messages_en.properties	Thu Oct 25 14:02:39 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Thu Oct 25 15:00:11 2012 +0200
@@ -161,6 +161,10 @@
 chart.historical.discharge.xaxis.label = Time
 chart.historical.discharge.yaxis.label = Q [m\u00b3/s]
 chart.historical.discharge.yaxis.second.label = W [cm]
+chart.historical.discharge.wq.title = Discharge Curves
+chart.historical.discharge.wq.subtitle = Gauge {0}
+chart.historical.discharge.wq.xaxis.label = Q [m\u00b3/s]
+chart.historical.discharge.wq.yaxis.label = W [cm]
 
 chart.reference.curve.title = Reference Curve
 chart.reference.curve.subtitle = {0}
http://dive4elements.wald.intevation.org