Mercurial > dive4elements > river

changeset 5333:623e5c9f91ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various i18n issues from flys/issue1180 .
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 19 Mar 2013 10:24:03 +0100
parents 26979cf5a31c
children b296d435fc69
files flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugeTimeRangePanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/WQSimpleArrayPanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/ClickableWTable.java
diffstat 7 files changed, 23 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Tue Mar 19 10:24:03 2013 +0100
@@ -426,6 +426,8 @@
 
     // OUTPUT TYPES
 
+    String discharge_curve_gaugeless();
+
     String discharge_curve();
 
     String gauge_discharge_curve();
@@ -452,6 +454,8 @@
 
     String wq_table_w();
 
+    String wq_waterlevel_label();
+
     String wq_table_q();
 
     String wq_value_w();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Tue Mar 19 10:24:03 2013 +0100
@@ -154,6 +154,7 @@
 name = Name
 type = Type
 wq_table_w = Characteristic Waterlevels
+wq_waterlevel_label = Characteristic Waterlevel
 wq_table_q = Characteristic Discharges / Durations
 wq_value_w = W [cm at Gauge]
 wq_value_q = Q [m\u00b3/s]
@@ -207,6 +208,7 @@
 add = Add
 
 discharge_curve = Discharge Curve at Gauge
+discharge_curve_gaugeless = Discharge Curve
 gauge_discharge_curve = Discharge Table at Gauge
 computed_discharge_curve = Discharge Curve
 computed_discharge_curves = Discharge Curves
@@ -588,7 +590,7 @@
 gauge_river_url = https://flys-intern.intevation.de/GewaesserInfo/
 gauge_curve_link = Dischargecurve/-table
 discharge_timeranges = DC-Timeranges
-discharge_chart = DC-Chart
+discharge_chart = WQ-Preview
 
 measurement_station_type = Type of Measurement Station
 measurement_station_operator = Operator
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Tue Mar 19 10:24:03 2013 +0100
@@ -140,6 +140,7 @@
 riverside = Flussseite
 name = Name
 type = Typ
+wq_waterlevel_label = Kennzeichnender Wassterstand
 wq_table_w = Kennzeichnende Wasserst\u00e4nde
 wq_table_q = Kennzeichnende Abfl\u00fcsse / Dauerzahlen
 wq_value_w = W [cm am Pegel]
@@ -207,6 +208,7 @@
 chartPropertiesTooltip = Diagrammeigenschaften
 
 discharge_curve = Abflusskurve am Pegel
+discharge_curve_gaugeless = Abflusskurve
 gauge_discharge_curve = Abflusstafel am Pegel
 computed_discharge_curve = Abflusskurve
 computed_discharge_curves = Abflusskurven
@@ -587,7 +589,7 @@
 gauge_river_url = https://flys-intern.intevation.de/GewaesserInfo/
 gauge_curve_link = Abflusskurve/-tafel
 discharge_timeranges = AK-Zeitr\u00e4ume
-discharge_chart = AK-Diagramm
+discharge_chart = WQ-Vorschau
 
 measurement_station_type = Messstellenart
 measurement_station_operator = Betreiber
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Tue Mar 19 10:24:03 2013 +0100
@@ -154,6 +154,7 @@
 top_edge = Top edge
 name = Name
 type = Type
+wq_waterlevel_label = Characteristic Waterlevel
 wq_table_w = Characteristic Waterlevels
 wq_table_q = Characteristic Discharges / Durations
 wq_value_w = W [cm at Gauge]
@@ -208,6 +209,7 @@
 add = Add
 
 discharge_curve = Discharge Curve at Gauge
+discharge_curve_gaugeless = Discharge Curve
 gauge_discharge_curve = Discharge Table at Gauge
 computed_discharge_curve = Discharge Curve
 computed_discharge_curves = Discharge Curves
@@ -588,7 +590,7 @@
 gauge_river_url = https://flys-intern.intevation.de/GewaesserInfo/
 gauge_curve_link = Dischargecurve/-table
 discharge_timeranges = DC-Timeranges
-discharge_chart = DC-Chart
+discharge_chart = WQ-Preview
 
 measurement_station_type = Type of Measurement Station
 measurement_station_operator = Operator
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugeTimeRangePanel.java	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugeTimeRangePanel.java	Tue Mar 19 10:24:03 2013 +0100
@@ -284,7 +284,7 @@
         };
 
 
-        ListGridField addstart = new ListGridField ("", "");
+        ListGridField addstart = new ListGridField ("", MESSAGES.from());
         addstart.setType (ListGridFieldType.ICON);
         addstart.setWidth (20);
         addstart.setCellIcon(baseUrl + MESSAGES.markerGreen());
@@ -301,7 +301,7 @@
             }
         });
 
-        ListGridField addend = new ListGridField ("", "");
+        ListGridField addend = new ListGridField ("", MESSAGES.to());
         addend.setType (ListGridFieldType.ICON);
         addend.setWidth (20);
         addend.setCellIcon(baseUrl + MESSAGES.markerRed());
@@ -319,7 +319,7 @@
         });
 
         ListGridField desc =
-            new ListGridField("description", MESSAGES.description());
+            new ListGridField("description", MESSAGES.discharge_curve_gaugeless());
         desc.setType(ListGridFieldType.TEXT);
         desc.setWidth("*");
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQSimpleArrayPanel.java	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQSimpleArrayPanel.java	Tue Mar 19 10:24:03 2013 +0100
@@ -184,7 +184,7 @@
             public void clickedLower(double value) {
                 panelW.addValue(value);
             }
-        }, ClickMode.SINGLE);
+        }, ClickMode.SINGLE, true);
 
         qTable = new ClickableQDTable(new ClickableQDTable.QClickedListener() {
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/ClickableWTable.java	Mon Mar 18 17:05:37 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/ClickableWTable.java	Tue Mar 19 10:24:03 2013 +0100
@@ -21,6 +21,8 @@
         NONE, SINGLE, RANGE
     }
 
+    private boolean useWaterlevelLabel = false;
+
     public static interface WClickedListener {
 
         void clickedLower(double value);
@@ -40,9 +42,10 @@
     }
 
     public ClickableWTable(WClickedListener lowerListener,
-        ClickMode selectionMode) {
+        ClickMode selectionMode, boolean alternativeLabel) {
         this.wClickedListener = lowerListener;
         this.clickMode = selectionMode;
+        this.useWaterlevelLabel = alternativeLabel;
         init();
     }
 
@@ -56,7 +59,8 @@
         setShowRecordComponentsByCell(true);
         setEmptyMessage(MESSAGE.empty_table());
 
-        ListGridField name = new ListGridField("name", MESSAGE.name());
+        ListGridField name = new ListGridField("name",
+            useWaterlevelLabel ? MESSAGE.wq_waterlevel_label() : MESSAGE.name() );
         name.setType(ListGridFieldType.TEXT);
         name.setWidth("*");
http://dive4elements.wald.intevation.org