Mercurial > dive4elements > river
changeset 2718:9ea3ac23bd9d
Include km in duration curve facets names.
flys-artifacts/trunk@4447 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 21 May 2012 09:06:48 +0000 |
| parents | 4cd55689e9a9 |
| children | d1d35892bbdd |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.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 | 6 files changed, 22 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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(
--- 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
--- 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
--- 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
--- 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