changeset 8247:b8f343230eab

Some i18n completion in hist. discharge curves.
author Tom Gottfried <tom@intevation.de>
date Tue, 09 Sep 2014 17:05:21 +0200
parents aef7542dd3ca
children 2b0ff11cef3f
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties artifacts/src/main/resources/messages_de_DE.properties artifacts/src/main/resources/messages_en.properties
diffstat 5 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java	Tue Sep 09 16:29:53 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java	Tue Sep 09 17:05:21 2014 +0200
@@ -244,7 +244,10 @@
                 : vc.findValueForQ(refTable, value);
 
             if (Double.isNaN(ref)) {
-                addProblem("hist.discharge.no.value.in.ref", value);
+                addProblem("hist.discharge.no.value.in.ref", value,
+                           mode == EvaluationMode.W.getMode()
+                           ? "cm"
+                           : "m\u00b3/s");
                 continue;
             }
 
--- a/artifacts/src/main/resources/messages.properties	Tue Sep 09 16:29:53 2014 +0200
+++ b/artifacts/src/main/resources/messages.properties	Tue Sep 09 17:05:21 2014 +0200
@@ -546,6 +546,7 @@
 w.w.qkm2.failed = Calculating Q for WST index {0,number,#.##} failed.
 w.w.wkm2.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 
+hist.discharge.no.value.in.ref = {0} {1} not in reference table
 cannot.find.hist.q.for.w = Cannot find Q for W = {0,number,#.##} in timerange {1, date} - {2, date}
 cannot.find.hist.w.for.q = Cannot find W for Q = {0,number,#.##} in timerange {1, date} - {2, date}
 cannot.find.hist.q.tables = Cannot find Discharge Tables for given timerange.
--- a/artifacts/src/main/resources/messages_de.properties	Tue Sep 09 16:29:53 2014 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Tue Sep 09 17:05:21 2014 +0200
@@ -549,6 +549,7 @@
 w.w.qkm2.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. 
 w.w.wkm2.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen. 
 
+hist.discharge.no.value.in.ref = {0} {1} nicht in Bezugskurve enthalten
 cannot.find.hist.q.for.w = Konnte zu W = {0,number,#.##} im Zeitraum ({1,date} - {2,date}) keinen Abfluss ermitteln.
 cannot.find.hist.w.for.q = Konnte zu Q = {0,number,#.##} im Zeitraum ({1,date} - {2,date}) keinen Wasserstand ermitteln.
 cannot.find.hist.q.tables = Konnte f\u00fcr den angegebenen Zeitraum keine Abflusstafeln finden.
--- a/artifacts/src/main/resources/messages_de_DE.properties	Tue Sep 09 16:29:53 2014 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Tue Sep 09 17:05:21 2014 +0200
@@ -544,6 +544,7 @@
 w.w.qkm2.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. 
 w.w.wkm2.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen. 
 
+hist.discharge.no.value.in.ref = {0} {1} nicht in Bezugskurve enthalten
 cannot.find.hist.q.for.w = Konnte zu W = {0,number,#.##} im Zeitraum ({1,date} - {2,date}) keinen Abfluss ermitteln.
 cannot.find.hist.w.for.q = Konnte zu Q = {0,number,#.##} im Zeitraum ({1,date} - {2,date}) keinen Wasserstand ermitteln.
 cannot.find.hist.q.tables = Konnte f\u00fcr den angegebenen Zeitraum keine Abflusstafeln finden.
--- a/artifacts/src/main/resources/messages_en.properties	Tue Sep 09 16:29:53 2014 +0200
+++ b/artifacts/src/main/resources/messages_en.properties	Tue Sep 09 17:05:21 2014 +0200
@@ -548,6 +548,7 @@
 w.w.qkm2.failed = Calculating Q for WST index {0,number,#.##} failed.
 w.w.wkm2.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 
+hist.discharge.no.value.in.ref = {0} {1} not in reference table
 cannot.find.hist.q.for.w = Cannot find Q for W = {0,number,#.##} in timerange {1, date} - {2, date}
 cannot.find.hist.w.for.q = Cannot find W for Q = {0,number,#.##} in timerange {1, date} - {2, date}
 cannot.find.hist.q.tables = Cannot find Discharge Tables for given timerange.

http://dive4elements.wald.intevation.org