Mercurial > dive4elements > river

changeset 2460:5659b5e8c9a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#204 Modified i18n strings in WQD table. flys-client/trunk@4165 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 20 Mar 2012 06:55:53 +0000
parents b892658a4fc9
children 4e81439ffa28
files flys-client/ChangeLog 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/WQInputPanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/WTable.java
diffstat 8 files changed, 38 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/ChangeLog	Tue Mar 20 06:55:53 2012 +0000
@@ -1,3 +1,20 @@
+2012-03-20  Ingo Weinzierl <ingo@intevation.de>
+
+	* flys/issue204 (W-INFO: Wasserspiegellagenberechnung / Layout Auswahlunterstützung Q/W/D) 
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants.java,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties:
+	  Added and modified i18n strings.
+
+	* src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java,
+	  src/main/java/de/intevation/flys/client/client/ui/wq/WTable.java:
+	  Renamed value columns.
+
+	* src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java:
+	  Renamed tab titles for W/Q/D tables.
+
 2012-03-19  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/webapp/WEB-INF/wms-services.xml: More WMS services configured.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Tue Mar 20 06:55:53 2012 +0000
@@ -363,7 +363,13 @@
 
     String type();
 
-    String wq_value();
+    String wq_table_w();
+
+    String wq_table_q();
+
+    String wq_value_w();
+
+    String wq_value_q();
 
     String discharge_longitudinal_section();
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Tue Mar 20 06:55:53 2012 +0000
@@ -128,7 +128,10 @@
 top_edge = Top edge
 name = Name
 type = Type
-wq_value = Q/D
+wq_table_w = Characteristic Waterlevels
+wq_table_q = Characteristic Discharges / Durations
+wq_value_w = W [cm at Gauge]
+wq_value_q = Q [m\u00b3/s]
 river_km = River-Km
 uesk_profile_distance = Distance [m]
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Tue Mar 20 06:55:53 2012 +0000
@@ -128,7 +128,10 @@
 riverside = Flussseite
 name = Name
 type = Typ
-wq_value = Q/D
+wq_table_w = Kennzeichnende Wasserst\u00e4nde
+wq_table_q = Kennzeichnende Abfl\u00fcsse / Dauerzahlen
+wq_value_w = W [cm am Pegel]
+wq_value_q = Q [m\u00b3/s]
 river_km = Fluss-Km
 uesk_profile_distance = Abstand [m]
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Tue Mar 20 06:55:53 2012 +0000
@@ -128,7 +128,8 @@
 top_edge = Top edge
 name = Name
 type = Type
-wq_value = Q/D
+wq_value_w = W [cm at Gauge]
+wq_value_q = Q [m\u00b3/s]
 river_km = River-Km
 uesk_profile_distance = Distance [m]
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Tue Mar 20 06:55:53 2012 +0000
@@ -256,9 +256,8 @@
         tabs.setWidth100();
         tabs.setHeight100();
 
-        // TODO i18n
-        Tab wTab = new Tab("W");
-        Tab qTab = new Tab("Q / D");
+        Tab wTab = new Tab(MESSAGE.wq_table_w());
+        Tab qTab = new Tab(MESSAGE.wq_table_q());
 
         wTab.setPane(wTable);
         qTab.setPane(qdTable);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java	Tue Mar 20 06:55:53 2012 +0000
@@ -56,7 +56,7 @@
 
         final NumberFormat nf = NumberFormat.getDecimalFormat();
 
-        ListGridField value = new ListGridField("value", MESSAGE.wq_value());
+        ListGridField value = new ListGridField("value", MESSAGE.wq_value_q());
         value.setType(ListGridFieldType.FLOAT);
         value.setCellFormatter(new CellFormatter() {
             @Override
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/WTable.java	Mon Mar 19 14:39:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/WTable.java	Tue Mar 20 06:55:53 2012 +0000
@@ -41,7 +41,7 @@
 
         final NumberFormat nf = NumberFormat.getDecimalFormat();
 
-        ListGridField value = new ListGridField("value", MESSAGE.wq_value());
+        ListGridField value = new ListGridField("value", MESSAGE.wq_value_w());
         value.setType(ListGridFieldType.FLOAT);
         value.setCellFormatter(new CellFormatter() {
             @Override
http://dive4elements.wald.intevation.org