Mercurial > dive4elements > river
changeset 3159:a6a3f9894fe0
FixA: I18N
flys-artifacts/trunk@4771 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Sun, 24 Jun 2012 17:44:39 +0000 (2012-06-24) |
parents | 0e8929d5e9e3 |
children | 8c78c707aa2d |
files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.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, 84 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Sun Jun 24 16:01:35 2012 +0000 +++ b/flys-artifacts/ChangeLog Sun Jun 24 17:44:39 2012 +0000 @@ -1,3 +1,14 @@ +2012-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: + Removed TODOs about I18N + + * src/main/resources/messages.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties, + src/main/resources/messages_de.properties: + Added strings for fixing analysis. + 2012-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/utils/KMIndex.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Sun Jun 24 16:01:35 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Sun Jun 24 17:44:39 2012 +0000 @@ -77,57 +77,44 @@ Boolean preprocessing = access.getPreprocessing(); if (river == null) { - // TODO: i18n addProblem("fix.missing.river"); } if (from == null) { - // TODO: i18n addProblem("fix.missing.from"); } if (to == null) { - // TODO: i18n addProblem("fix.missing.to"); } if (step == null) { - // TODO: i18n - addProblem("fix.missing.step"); } if (function == null) { - // TODO: i18n - addProblem("fix.missing.function"); } if (events == null || events.length < 1) { - // TODO: i18n addProblem("fix.missing.events"); } if (referencePeriod == null) { - // TODO: i18n addProblem("fix.missing.reference.period"); } if (analysisPeriods == null || analysisPeriods.length < 1) { - // TODO: i18n addProblem("fix.missing.analysis.periods"); } if (qSectorStart == null) { - // TODO: i18n addProblem("fix.missing.qstart.sector"); } if (qSectorEnd == null) { - // TODO: i18n addProblem("fix.missing.qend.sector"); } if (preprocessing == null) { - // TODO: i18n addProblem("fix.missing.preprocessing"); } @@ -161,7 +148,6 @@ .getFunction(function); if (func == null) { - // TODO: i18n addProblem("fix.invalid.function.name"); } @@ -172,7 +158,6 @@ final List<Column> eventColumns = getEventColumns(overview); if (eventColumns.size() < 2) { - // TODO: i18n addProblem("fix.too.less.data.columns"); return new CalculationResult(this); } @@ -241,7 +226,6 @@ if (!fitting.fit(qs, ws)) { ++numFailed; - // TODO: i18n addProblem(km, "fix.fitting.failed"); continue; } @@ -268,7 +252,6 @@ } if (invalid) { - // TODO: i18n addProblem("fix.invalid.values"); results.removeNaNs(); } @@ -307,7 +290,6 @@ FixingsColumn data = fcf.getColumnData(meta); if (data == null) { - // TODO: i18n addProblem("fix.cannot.load.data"); } else { @@ -326,7 +308,7 @@ ) { Range range = new Range(from, to); - int kmIndex = parameters.columnIndex("km"); + int kmIndex = parameters.columnIndex("km"); int maxQIndex = parameters.columnIndex("max_q"); ColumnCache cc = new ColumnCache();
--- a/flys-artifacts/src/main/resources/messages.properties Sun Jun 24 16:01:35 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages.properties Sun Jun 24 17:44:39 2012 +0000 @@ -340,3 +340,21 @@ chart.fix.deltawt.subtitle=add subtitle chart.fix.deltawt.xaxis.label=Date chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm] + +fix.missing.river=Missing river +fix.missing.from=Missing start km +fix.missing.to=Missing end km +fix.missing.step="Missing step width +fix.missing.function=Missing function type +fix.missing.events=Missing list of events +fix.missing.reference.period=Missing reference period +fix.missing.analysis.periods=Missing analysis periods +fix.missing.qstart.sector=Missing discharge start sector +fix.missing.qend.sector=Missing discharge end sector +fix.missing.prepocessing=Missing info about preprocessing +fix.no.overview.available=No overview available +fix.invalid.function.name=Name of function unknown +fix.too.less.data.colums=Too less data columns for calculation +fix.fitting.failed=Fitting failed +fix.invalid.values=Invalid values +fix.cannot.load.data=Cannot fetch data from database
--- a/flys-artifacts/src/main/resources/messages_de.properties Sun Jun 24 16:01:35 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages_de.properties Sun Jun 24 17:44:39 2012 +0000 @@ -341,3 +341,21 @@ chart.fix.deltawt.subtitle=add subtitle chart.fix.deltawt.xaxis.label=Datum chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm] + +fix.missing.river=Kein Gew\u00e4sser gew\u00e4hlt +fix.missing.from=Kein Startkilometer gew\u00e4hlt +fix.missing.to=Kein Endkilometer gew\u00e4hlt +fix.missing.step=Keine Schrittweite angegeben +fix.missing.function=Unbekannter Funktions-Typ +fix.missing.events=Liste der Ereignisse fehlt +fix.missing.reference.period=Kein Bezugszeitraum angegeben +fix.missing.analysis.periods=Keine Analysezeitr\u00e4umen angegeben +fix.missing.qstart.sector=Fehlender unterer Abflusssektor +fix.missing.qend.sector=Fehlender oberer Abflusssektor +fix.missing.prepocessing=Kein Information \u00fcber Aussrei\u00dfertests vorhanden +fix.no.overview.available=Keine Daten\u00fcbersicht vorhanden +fix.invalid.function.name=Unbekannter Funktionsname +fix.too.less.data.colums=Zuwenig Daten f\u00fcr eine Kurvenanpassung +fix.fitting.failed=Kurvenanpassung fehlgeschlagen +fix.invalid.values=Ung\u00fcltige Werte +fix.cannot.load.data=Daten konnten nicht aus der Datenbank geladen werden
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties Sun Jun 24 16:01:35 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Sun Jun 24 17:44:39 2012 +0000 @@ -340,3 +340,21 @@ chart.fix.deltawt.subtitle=add subtitle chart.fix.deltawt.xaxis.label=Datum chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm] + +fix.missing.river=Kein Gew\u00e4sser gew\u00e4hlt +fix.missing.from=Kein Startkilometer gew\u00e4hlt +fix.missing.to=Kein Endkilometer gew\u00e4hlt +fix.missing.step=Keine Schrittweite angegeben +fix.missing.function=Unbekannter Funktions-Typ +fix.missing.events=Liste der Ereignisse fehlt +fix.missing.reference.period=Kein Bezugszeitraum angegeben +fix.missing.analysis.periods=Keine Analysezeitr\u00e4umen angegeben +fix.missing.qstart.sector=Fehlender unterer Abflusssektor +fix.missing.qend.sector=Fehlender oberer Abflusssektor +fix.missing.prepocessing=Kein Information \u00fcber Aussrei\u00dfertests vorhanden +fix.no.overview.available=Keine Daten\u00fcbersicht vorhanden +fix.invalid.function.name=Unbekannter Funktionsname +fix.too.less.data.colums=Zuwenig Daten f\u00fcr eine Kurvenanpassung +fix.fitting.failed=Kurvenanpassung fehlgeschlagen +fix.invalid.values=Ung\u00fcltige Werte +fix.cannot.load.data=Daten konnten nicht aus der Datenbank geladen werden
--- a/flys-artifacts/src/main/resources/messages_en.properties Sun Jun 24 16:01:35 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages_en.properties Sun Jun 24 17:44:39 2012 +0000 @@ -340,3 +340,21 @@ chart.fix.deltawt.subtitle=add subtitle chart.fix.deltawt.xaxis.label=Date chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm] + +fix.missing.river=Missing river +fix.missing.from=Missing start km +fix.missing.to=Missing end km +fix.missing.step="Missing step width +fix.missing.function=Missing function type +fix.missing.events=Missing list of events +fix.missing.reference.period=Missing reference period +fix.missing.analysis.periods=Missing analysis periods +fix.missing.qstart.sector=Missing discharge start sector +fix.missing.qend.sector=Missing discharge end sector +fix.missing.prepocessing=Missing info about preprocessing +fix.no.overview.available=No overview available +fix.invalid.function.name=Name of function unknown +fix.too.less.data.colums=Too less data columns for calculation +fix.fitting.failed=Fitting failed +fix.invalid.values=Invalid values +fix.cannot.load.data=Cannot fetch data from database