Mercurial > dive4elements > river

changeset 3135:d7bc53701b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated i18n for delta W(t) chart in fix analysis. flys-artifacts/trunk@4742 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 21 Jun 2012 13:17:44 +0000
parents 5a0aef74c316
children f12a8ed8d973
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.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 6 files changed, 61 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu Jun 21 13:15:48 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Jun 21 13:17:44 2012 +0000
@@ -1,3 +1,14 @@
+2012-06-21  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java:
+	  Updated i18n.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties:
+	  Added i18n string for delta W(t) chart.
+
 2012-06-21  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Thu Jun 21 13:15:48 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Thu Jun 21 13:17:44 2012 +0000
@@ -46,7 +46,7 @@
     /** The log used in this class. */
     private static Logger log = Logger.getLogger(FixationCompute.class);
 
-    private static final String I18N_REFERENCEPERIOD = "fix.reference.period";
+    private static final String I18N_REFERENCEPERIOD = "fix.reference.period.events";
 
     private static final String I18N_ANALYSISPERIODS = "fix.analysis.periods";
 
@@ -54,6 +54,10 @@
 
     private static final String I18N_OUTLIER = "fix.outlier";
 
+    private static final String I18N_ANALYSIS = "fix.analysis";
+
+    private static final String I18N_DEVIATION = "fix.deviation";
+
     /**
      * The default constructor that initializes an empty State object.
      */
@@ -98,13 +102,14 @@
         int count = access.getAnalysisPeriods().length;
         for (int i = 0; i < count; i++) {
             DateRange period = access.getAnalysisPeriods()[i];
+            DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
+            String startDate = df.format(period.getFrom());
+            String endDate = df.format(period.getTo());
+
             for (int j = access.getQSectorStart().intValue();
                  j <= access.getQSectorEnd().intValue();
                  j++) {
 
-                DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
-                String startDate = df.format(period.getFrom());
-                String endDate = df.format(period.getTo());
                 String sector = "";
                 switch (j) {
                     case 0: sector = "[0 - (MNQ+MQ)/2)"; break;
@@ -134,9 +139,11 @@
                                          description));
 
             }
-            String eventDesc = period.getFrom().toString() +
-                               " - " +
-                               period.getTo().toString();
+            String eventDesc =
+                Resources.getMsg(context.getMeta(),
+                                 I18N_ANALYSIS,
+                                 I18N_ANALYSIS) +
+                ": " + startDate + " - " + endDate;
             facets.add(new FixAnalysisEventsFacet(i,
                 FIX_ANALYSIS_EVENTS_DWT,
                 eventDesc));
@@ -183,7 +190,10 @@
                 I18N_DERIVATIVE,
                 I18N_DERIVATIVE)));
 
-        facets.add(new FixDeviationFacet(FIX_DEVIATION_DWT, "Abweichung"));
+        facets.add(new FixDeviationFacet(FIX_DEVIATION_DWT,
+            Resources.getMsg(context.getMeta(),
+                I18N_DEVIATION,
+                I18N_DEVIATION)));
         return res;
     }
 }
--- a/flys-artifacts/src/main/resources/messages.properties	Thu Jun 21 13:15:48 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Thu Jun 21 13:17:44 2012 +0000
@@ -329,6 +329,14 @@
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
 
 fix.reference.period=Referenceperiod
+fix.reference.period=Referenceperiodevents
 fix.analysis.periods=Analysisperiods
 fix.derivative=Derivative
 fix.outlier=Outlier
+fix.analysis=Analysis
+fix.deviation=Standard deviation
+
+chart.fix.deltawt.title=Delta W(t) (Please change...)
+chart.fix.deltawt.subtitle=add subtitle
+chart.fix.deltawt.xaxis.label=Date
+chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
--- a/flys-artifacts/src/main/resources/messages_de.properties	Thu Jun 21 13:15:48 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Thu Jun 21 13:17:44 2012 +0000
@@ -330,6 +330,14 @@
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
 
 fix.reference.period=Bezugszeitraum
+fix.reference.period.events=Ereignisse im Bezugszeitraum
 fix.analysis.periods=Analysezeitr\u00e4ume
 fix.derivative=Ableitung
 fix.outlier=Ausrei\u00dfer
+fix.analysis=Analyse
+fix.deviation=Standardabweichung
+
+chart.fix.deltawt.title=Delta W(t) (Bitte ändern...)
+chart.fix.deltawt.subtitle=add subtitle
+chart.fix.deltawt.xaxis.label=Datum
+chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Jun 21 13:15:48 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Jun 21 13:17:44 2012 +0000
@@ -327,6 +327,14 @@
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
 
 fix.reference.period=Bezugszeitraum
+fix.reference.period.events=Ereignisse im Bezugszeitraum
 fix.analysis.periods=Analysezeitr\u00e4ume
 fix.derivative=Ableitung
 fix.outlier=Ausrei\u00dfer
+fix.analysis=Analyse
+fix.deviation=Standardabweichung
+
+chart.fix.deltawt.title=Delta W(t) (Bitte ändern...)
+chart.fix.deltawt.subtitle=add subtitle
+chart.fix.deltawt.xaxis.label=Datum
+chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
--- a/flys-artifacts/src/main/resources/messages_en.properties	Thu Jun 21 13:15:48 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Thu Jun 21 13:17:44 2012 +0000
@@ -329,6 +329,14 @@
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
 
 fix.reference.period=Referenceperiod
+fix.reference.period.events=Referenceperiodevents
 fix.analysis.periods=Analysisperiods
 fix.derivative=Derivative
 fix.outlier=Outlier
+fix.analysis=Analysis
+fix.deviation=Standard deviation
+
+chart.fix.deltawt.title=Delta W(t) (Please change...)
+chart.fix.deltawt.subtitle=add subtitle
+chart.fix.deltawt.xaxis.label=Date
+chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
http://dive4elements.wald.intevation.org