# HG changeset patch # User Ingo Weinzierl # Date 1332226553 0 # Node ID 5659b5e8c9a8c14ea6edb711a1f3b1b09f548e54 # Parent b892658a4fc9929cfbe9e00eb06f7616fcd7db98 #204 Modified i18n strings in WQD table. flys-client/trunk@4165 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/ChangeLog --- 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 + + * 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 * src/main/webapp/WEB-INF/wms-services.xml: More WMS services configured. diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java --- 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(); diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties --- 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] diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties --- 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] diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties --- 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] diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java --- 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); diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java --- 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 diff -r b892658a4fc9 -r 5659b5e8c9a8 flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/WTable.java --- 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