# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1337591208 0
# Node ID 9ea3ac23bd9d06415294c908758c9a751a2a2094
# Parent  4cd55689e9a918cf7dbc7789ca09db58acfa306e
Include km in duration curve facets names.

flys-artifacts/trunk@4447 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 4cd55689e9a9 -r 9ea3ac23bd9d flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon May 21 09:02:58 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon May 21 09:06:48 2012 +0000
@@ -1,3 +1,14 @@
+2012-05-21  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java:
+	  Include km in names of duration curve facets.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties: Adjusted i18n for
+	  duration curve facet names (now include km).
+
 2012-05-21  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	* doc/conf/meta-data.xml: Allow loading of previous duration curves and
diff -r 4cd55689e9a9 -r 9ea3ac23bd9d flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java	Mon May 21 09:02:58 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java	Mon May 21 09:06:48 2012 +0000
@@ -66,8 +66,10 @@
             WQDay wqday = (WQDay)res.getData();
 
             if (wqday != null && facets != null) {
+                // Create an i18ed name for a (w or q) duration curve facet.
                 Object[] args = new Object[] {
-                    FLYSUtils.getRiver(winfo).getName()
+                    FLYSUtils.getRiver(winfo).getName(),
+                    FLYSUtils.getLocations(winfo)[0]
                 };
 
                 String nameW = Resources.getMsg(
diff -r 4cd55689e9a9 -r 9ea3ac23bd9d flys-artifacts/src/main/resources/messages.properties
--- a/flys-artifacts/src/main/resources/messages.properties	Mon May 21 09:02:58 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Mon May 21 09:06:48 2012 +0000
@@ -100,8 +100,8 @@
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Duration of Non-Exceedence [Days]
 chart.duration.curve.yaxis.label = W [NN + m]
-chart.duration.curve.curve.w = Waterlevel duration curve for {0}
-chart.duration.curve.curve.q = Discharge duration curve for {0}
+chart.duration.curve.curve.w = Waterlevel duration curve for {0} (km: {1})
+chart.duration.curve.curve.q = Discharge duration curve for {0} (km: {1})
 chart.historical.discharge.title = Historical Discharge Curves
 chart.historical.discharge.subtitle = Gauge {0}
 chart.historical.discharge.xaxis.label = Time
diff -r 4cd55689e9a9 -r 9ea3ac23bd9d flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties	Mon May 21 09:02:58 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Mon May 21 09:06:48 2012 +0000
@@ -99,8 +99,8 @@
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Unterschreitungsdauer [Tage]
 chart.duration.curve.yaxis.label = W [NN + m]
-chart.duration.curve.curve.w = Wasserstandsdauerline f\u00fcr {0}
-chart.duration.curve.curve.q = Abflussdauerline f\u00fcr {0}
+chart.duration.curve.curve.w = Wasserstandsdauerline f\u00fcr {0} (km:{1})
+chart.duration.curve.curve.q = Abflussdauerline f\u00fcr {0} (km:{1})
 chart.historical.discharge.title = Historische Abflusskurven
 chart.historical.discharge.subtitle = Pegel {0}
 chart.historical.discharge.xaxis.label = Zeit
diff -r 4cd55689e9a9 -r 9ea3ac23bd9d flys-artifacts/src/main/resources/messages_de_DE.properties
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon May 21 09:02:58 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon May 21 09:06:48 2012 +0000
@@ -97,8 +97,8 @@
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Unterschreitungsdauer [Tage]
 chart.duration.curve.yaxis.label = W [NN + m]
-chart.duration.curve.curve.w = Wasserstandsdauerline f\u00fcr {0}
-chart.duration.curve.curve.q = Abflussdauerline f\u00fcr {0}
+chart.duration.curve.curve.w = Wasserstandsdauerline f\u00fcr {0} (km:{1})
+chart.duration.curve.curve.q = Abflussdauerline f\u00fcr {0} (km:{1})
 chart.historical.discharge.title = Historische Abflusskurven
 chart.historical.discharge.subtitle = Pegel {0}
 chart.historical.discharge.xaxis.label = Zeit
diff -r 4cd55689e9a9 -r 9ea3ac23bd9d flys-artifacts/src/main/resources/messages_en.properties
--- a/flys-artifacts/src/main/resources/messages_en.properties	Mon May 21 09:02:58 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Mon May 21 09:06:48 2012 +0000
@@ -99,8 +99,8 @@
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Duration of Non-Exceedence [Days]
 chart.duration.curve.yaxis.label = W [NN + m]
-chart.duration.curve.curve.w = Waterlevel duration curve for {0}
-chart.duration.curve.curve.q = Discharge duration curve for {0}
+chart.duration.curve.curve.w = Waterlevel duration curve for {0} (km: {1})
+chart.duration.curve.curve.q = Discharge duration curve for {0} (km: {1})
 chart.historical.discharge.title = Historical Discharge Curves for Gauge {0}
 chart.historical.discharge.subtitle = Gauge {0}
 chart.historical.discharge.xaxis.label = Time