Mercurial > dive4elements > river

changeset 3049:5e9533687a0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added i18n in fix analysis. flys-artifacts/trunk@4621 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 07 Jun 2012 09:44:00 +0000
parents fa763b270e78
children 02254d763bc0
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.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 7 files changed, 70 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Jun 07 09:44:00 2012 +0000
@@ -1,3 +1,15 @@
+2012-06-07  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java,
+	  src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java:
+	  Use i18n strings.
+
+	* 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 strings.
+
 2012-06-07  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Thu Jun 07 09:44:00 2012 +0000
@@ -28,6 +28,8 @@
 
 import de.intevation.flys.artifacts.states.DefaultState;
 
+import de.intevation.flys.artifacts.resources.Resources;
+
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -43,6 +45,13 @@
     /** 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_ANALYSISPERIODS = "fix.analysis.periods";
+
+    private static final String I18N_DERIVATIVE = "fix.derivative";
+
+    private static final String I18N_OUTLIER = "fix.outlier";
 
     /**
      * The default constructor that initializes an empty State object.
@@ -132,29 +141,41 @@
                 FIX_ANALYSIS_EVENTS_WQ,
                 eventDesc));
         }
+
+        String i18n_ref = Resources.getMsg(context.getMeta(),
+                I18N_REFERENCEPERIOD,
+                I18N_REFERENCEPERIOD);
+
         facets.add(new FixReferenceEventsFacet(0,
             FIX_REFERENCE_EVENTS_DWT,
-            "Referenceperiod"));
+            i18n_ref));
         facets.add(new FixReferenceEventsFacet(1,
             FIX_REFERENCE_EVENTS_LS,
-            "Referenceperiod"));
+            i18n_ref));
         facets.add(new FixReferenceEventsFacet(2,
             FIX_REFERENCE_EVENTS_WQ,
-            "Referenceperiod"));
+            i18n_ref));
 
+        String i18n_ana = Resources.getMsg(context.getMeta(),
+                I18N_ANALYSISPERIODS,
+                I18N_ANALYSISPERIODS);
         facets.add(new FixAnalysisPeriodsFacet(0,
             FIX_ANALYSIS_PERIODS_DWT,
-            "Analysis periods"));
+            i18n_ana));
         facets.add(new FixAnalysisPeriodsFacet(1,
             FIX_ANALYSIS_PERIODS_LS,
-            "Analysis periods"));
+            i18n_ana));
         facets.add(new FixAnalysisPeriodsFacet(2,
             FIX_ANALYSIS_PERIODS_WQ,
-            "Analysis periods"));
+            i18n_ana));
 
         facets.add(new FixWQCurveFacet("W/Q"));
-        facets.add(new FixOutlierFacet(FIX_OUTLIER, "Outlier"));
-        facets.add(new FixDerivateFacet(FIX_DERIVATE, "Derivative"));
+        facets.add(new FixOutlierFacet(FIX_OUTLIER,
+            Resources.getMsg(context.getMeta(), I18N_OUTLIER, I18N_OUTLIER)));
+        facets.add(new FixDerivateFacet(FIX_DERIVATE,
+            Resources.getMsg(context.getMeta(),
+                I18N_DERIVATIVE,
+                I18N_DERIVATIVE)));
 
         return res;
     }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java	Thu Jun 07 09:44:00 2012 +0000
@@ -41,7 +41,9 @@
         elements[0] = createItem(
                 ec,
                 new String[] {
-                    Resources.getMsg(meta, "preprocess", "preprocess"),
+                    Resources.getMsg(meta,
+                        "state.fix.preprocess",
+                        "state.fix.preprocess"),
                     "preprocess"});
 
         return elements;
--- a/flys-artifacts/src/main/resources/messages.properties	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Thu Jun 07 09:44:00 2012 +0000
@@ -28,6 +28,7 @@
 state.fix.analysis.analysisperiods = Analysis period
 state.fix.analysis.function = Function
 state.fix.analysis.preprocessing = Preprocessing
+state.fix.preprocess=preprocess
 
 state.minfo.river = River
 state.minfo.calculation_mode = Calculation Mode
@@ -296,3 +297,8 @@
 help.winfo.historical.discharge.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Wahl_des_Bezugspegels
 help.winfo.historical.discharge.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_des_Auswertezeitraumes
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
+
+fix.reference.period=Referenceperiod
+fix.analysis.periods=Analysisperiods
+fix.derivative=Derivative
+fix.outlier=Outlier
--- a/flys-artifacts/src/main/resources/messages_de.properties	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Thu Jun 07 09:44:00 2012 +0000
@@ -27,7 +27,8 @@
 state.fix.analysis.referenceperiod = Bezugszeitraum
 state.fix.analysis.analysisperiods = Analysezeitr\u00e4ume
 state.fix.analysis.function = Funktion
-state.fix.analysis.preprocessing = Preprocessing
+state.fix.analysis.preprocessing = Aufbereiten
+state.fix.preprocess=aufbereiten
 
 state.minfo.river = Gew\u00e4sser
 state.minfo.calculation_mode = Berechnungsart
@@ -297,3 +298,8 @@
 help.winfo.historical.discharge.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Wahl_des_Bezugspegels
 help.winfo.historical.discharge.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_des_Auswertezeitraumes
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
+
+fix.reference.period=Bezugszeitraum
+fix.analysis.periods=Analysezeitr\u00e4ume
+fix.derivative=Ableitung
+fix.outlier=Ausrei\u00dfer
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Jun 07 09:44:00 2012 +0000
@@ -27,7 +27,8 @@
 state.fix.analysis.referenceperiod = Bezugszeitraum
 state.fix.analysis.analysisperiods = Analysezeitr\u00e4ume
 state.fix.analysis.function = Funktion
-state.fix.analysis.preprocessing = Preprocessing
+state.fix.analysis.preprocessing = Aufbereitung
+state.fix.preprocess=aufbereiten
 
 state.minfo.river = Gew\u00e4sser
 state.minfo.calculation_mode = Berechnungsart
@@ -294,3 +295,8 @@
 help.winfo.historical.discharge.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Wahl_des_Bezugspegels
 help.winfo.historical.discharge.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_des_Auswertezeitraumes
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
+
+fix.reference.period=Bezugszeitraum
+fix.analysis.periods=Analysezeitr\u00e4ume
+fix.derivative=Ableitung
+fix.outlier=Ausrei\u00dfer
--- a/flys-artifacts/src/main/resources/messages_en.properties	Thu Jun 07 08:48:01 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Thu Jun 07 09:44:00 2012 +0000
@@ -28,6 +28,7 @@
 state.fix.analysis.analysisperiods = Analysis period
 state.fix.analysis.function = Function
 state.fix.analysis.preprocessing = Preprocessing
+state.fix.preprocess=preprocess
 
 state.minfo.river = River
 state.minfo.calculation_mode = Calculation Mode
@@ -296,3 +297,8 @@
 help.winfo.historical.discharge.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Wahl_des_Bezugspegels
 help.winfo.historical.discharge.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_des_Auswertezeitraumes
 help.winfo.historical.discharge.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#Auswahl_der_Analyseart
+
+fix.reference.period=Referenceperiod
+fix.analysis.periods=Analysisperiods
+fix.derivative=Derivative
+fix.outlier=Outlier
http://dive4elements.wald.intevation.org