[PATCH] Changes after Testing
Wald Commits
scm-commit at wald.intevation.org
Thu Sep 6 18:02:08 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1536249722 -7200
# Node ID 45908b79c0792c266329f62bc899c3d83a41a5f6
# Parent 05e572a944c88a35c76f6c977c4f80eaf467e80a
Changes after Testing
diff -r 05e572a944c8 -r 45908b79c079 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml Thu Sep 06 15:25:01 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml Thu Sep 06 18:02:02 2018 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-08-23T10:59:52 -->
+<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 4.5.0 -->
+<!-- 2018-09-06T17:55:01 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
@@ -138,13 +138,13 @@
<textFieldExpression><![CDATA[$F{meta:station_from_header}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="150" height="24"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="178" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:channel_miss_volume_header}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="0" width="150" height="24"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="338" y="0" width="150" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:channel_miss_mass_header}]]></textFieldExpression>
@@ -171,7 +171,7 @@
<textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="-4" width="150" height="15"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="-4" width="178" height="15"/>
<box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -182,7 +182,7 @@
<textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="-4" width="150" height="15"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="338" y="-4" width="150" height="15"/>
<box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
diff -r 05e572a944c8 -r 45908b79c079 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Thu Sep 06 15:25:01 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties Thu Sep 06 18:02:02 2018 +0200
@@ -1,5 +1,5 @@
-false=Nein
-true=Ja
+false=No
+true=Yes
state.winfo.river = River
state.winfo.calculation_mode = Calculation Mode
@@ -14,11 +14,11 @@
state.winfo.uesk.profiles = Interpolated Profiles
state.winfo.uesk.floodplain = Lateral Boundary
state.winfo.uesk.differences = Differences between waterlevel and terrain
-state.winfo.uesk.scenario = Flood Plain / Scenario
+state.winfo.uesk.scenario = Floodplain/Scenario
state.winfo.uesk.dc-hws = HWS
state.winfo.uesk.user-rgd = User defined shapefiles
state.winfo.uesk.barriers = Digitized HWS
-state.winfo.waterlevel_pair_select = Chosen Differences
+state.winfo.waterlevel_pair_select = Differences Choice
state.winfo.historicalq.reference_gauge = Selection of Gauge
state.winfo.historicalq.timerange = Selection of Evaluation time
state.winfo.historicalq.mode = Selecion of analyses
@@ -31,7 +31,7 @@
state.fix.calculation.mode = Calculation Mode
state.fix.location = Distance
state.fix.period = Period
-state.fix.gaugerange = Discharge Sectors
+state.fix.gaugerange = Discharge Class
state.fix.eventselect = Event selection
state.fix.analysis.referenceperiod = Reference period
state.fix.analysis.analysisperiods = Analysis period
@@ -62,7 +62,7 @@
state.minfo.bed.error.no_data = No data found for selected range.
state.minfo.bed.error.no_data_for_period = No data found for period: {0} - {1}.
state.minfo.soundings = Choose Soundings
-state.uinfo.salix.historical.soundings=Sounding-based Selection of a Historical State
+state.uinfo.salix.historical.soundings=Sounding-Based Selection of a Historical State
state.bundu.wst.soundings = Choose Sounding
state.minfo.sediment.load.location = Range
state.minfo.sediment.load.year_epoch = Year/Epoch
@@ -104,7 +104,7 @@
year=Year
epoch=Epoch
off_epoch = off. Epochs
-soundings = Soundings / Epochs
+soundings = Soundings/Epochs
t_per_a = t/a
m3_per_a = m\u00b3/a
@@ -404,7 +404,7 @@
export.waterlevel.csv.header.location = Location
export.waterlevel.csv.header.gauge = Reference Gauge
export.waterlevel.csv.meta.result = # Calculation Output - {0} - Waterlevel - FLYS 3
-export.waterlevel.csv.meta.creation = # Time of creation: {0}
+export.waterlevel.csv.meta.creation = # Time of Creation: {0}
export.waterlevel.csv.meta.calculationbase = # Calculation base: {0}
export.waterlevel.csv.meta.river = # River: {0}
export.waterlevel.csv.meta.range = # Location/Range (km): {0} - {1}
@@ -418,7 +418,7 @@
export.discharge.longitudinal.section.csv.header.km = River-Km
export.discharge.longitudinal.section.csv.header.w = W [NN + m]
export.discharge.longitudinal.section.csv.header.cw = W corr. [NN + m]
-export.discharge.curve.at.gauge.header = Dischargetable for {1}/{0} since {2} datum[{4}] = {3}
+export.discharge.curve.at.gauge.header = Discharge Table for {1}/{0} since {2} datum[{4}] = {3}
export.discharge.curve.at.header = Computed discharge curve for {0} {0}-km: {1}
export.historical.discharge.csv.header.timerange = Timerange
export.historical.discharge.csv.header.waterlevel = Waterlevel [cm]
@@ -453,7 +453,7 @@
export.flow_velocity.csv.header.tau_main = Bottom Shear Stress Main Channel
export.flow_velocity.csv.header.locations = Location
export.bedheight_middle.csv.header.km = River km
-export.bedheight_middle.csv.header.sounding = Sounding / Epoch
+export.bedheight_middle.csv.header.sounding = Sounding/Epoch
export.bedheight_middle.csv.header.height = Mean Bed Height [{0}]
export.bedheight_middle.csv.header.uncertainty = Uncertainty [m]
export.bedheight_middle.csv.header.datagap = Data Gap
@@ -672,7 +672,7 @@
fix.reference.deviation=Reference deviation
fix.vollmer.wq.curve=Adjusted function
fix.vollmer.wq.events=Events
-qsectors=Discharge Sectors
+qsectors=Discharge Class
fix.mnq=around MNQ
fix.mq=around MQ
fix.mhq=around MHQ
@@ -829,10 +829,10 @@
state.sinfo.transport_bodies_heights=Transport Body Heights
help.state.sinfo.transport_bodies_heights=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.transport_bodies_heights
-state.sinfo.waterlevel_soundings_select= Chosen Differences
+state.sinfo.waterlevel_soundings_select= Differences Choice
help.state.sinfo.waterlevel_soundings_select=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.waterlevel_soundings_select
-state.sinfo.waterlevel_soundings_minmax_select= Chosen Differences
+state.sinfo.waterlevel_soundings_minmax_select= Differences Choice
help.state.sinfo.waterlevel_soundings_minmax_select=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.waterlevel_soundings_minmax_select
state.sinfo.use_transport_bodies=Transport Body Heights
@@ -857,7 +857,7 @@
help.state.sinfo.collisions.epochs = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.epochs
help.state.sinfo.collisions.years = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.years
-state.sinfo.riverside = Select Riverside
+state.sinfo.riverside = Riverside Selection
state.sinfo.riverside.option1 = Left Riverside
state.sinfo.riverside.option2 = Right Riverside
state.sinfo.riverside.option3 = Both Riversides
@@ -882,7 +882,7 @@
sinfo.export.flow_depth.csv.meta.user = # {0}: {1}
sinfo.export.flow_depth.csv.meta.user.label = User
sinfo.export.flow_depth.csv.meta.creation = # {0}: {1}
-sinfo.export.flow_depth.csv.meta.creation.label = Time of creation
+sinfo.export.flow_depth.csv.meta.creation.label = Time of Creation
sinfo.export.flow_depth.csv.meta.river = # {0}: {1}
sinfo.export.flow_depth.csv.meta.river.label = River
common.export.csv.meta.header.sounding = ##METADATA SOUNDING
@@ -918,13 +918,13 @@
bundu.export.bezugswst.csv.meta.miss.channel.width = Channel Width [m]
bundu.export.bezugswst.pdf.meta.miss.channel.width = Channel Width [m]
bundu.export.bezugswst.csv.meta.miss.costs = Excavation Costs [\u20ac]
-bundu.export.bezugswst.pdf.meta.miss.costs = Excava-tion Costs [\u20ac]
+bundu.export.bezugswst.pdf.meta.miss.costs = Excavation Costs [\u20ac]
bundu.export.bezugswst.csv.meta.miss.excavation = Excavation Volume [m\u00b3]
-bundu.export.bezugswst.pdf.meta.miss.excavation = Excava-tion Volume [m\u00b3]
-bundu.export.bezugswst.csv.meta.miss.mass.total = Missing Depth total Mass [t]
+bundu.export.bezugswst.pdf.meta.miss.excavation = Excavation Volume [m\u00b3]
+bundu.export.bezugswst.csv.meta.miss.mass.total = Missing Depth Total Mass [t]
bundu.export.bezugswst.csv.meta.miss.volume.total = Missing Depth Total Volume [m\u00b3]
bundu.export.bezugswst.csv.meta.miss.exists = Missing Depths Available?
-bundu.export.bezugswst.pdf.meta.miss.exists = Miss-ing Depths Avail-able?
+bundu.export.bezugswst.pdf.meta.miss.exists = Missing Depths Avail-able?
bundu.export.bezugswst.csv.meta.miss.channel.min_depth = Channel Depths to be Provided [m]
bundu.export.bezugswst.pdf.meta.miss.channel.min_depth = Channel Depths to be Pro-vided [m]
bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Lower Edge of Channel
@@ -934,15 +934,15 @@
bundu.export.bezugswst.csv.meta.miss.volume.field = Field {0} Missing Volume [m\u00b3]
bundu.export.bezugswst.csv.meta.miss.mass.mean_bed = Mean Bed Height Missing Mass [t]
bundu.export.bezugswst.csv.meta.miss.volume.mean_bed = Mean Bed Height Missing Volume [m\u00b3]
-bundu.export.bezugswst.csv.meta.miss.km_from = River-km from
-bundu.export.bezugswst.csv.meta.miss.km_to = River-km to
+bundu.export.bezugswst.csv.meta.miss.km_from = River-km From
+bundu.export.bezugswst.csv.meta.miss.km_to = River-km To
export.flow_depth.csv.header.km = River-km
sinfo.export.flow_depth.csv.header.flowdepth = Flow Depth
sinfo.export.flow_depth.csv.header.flowdepthTkh = Flow Depth incl. TBH
sinfo.export.flow_depth.csv.header.tkh = TBH
sinfo.export.flow_depth.csv.header.waterlevel = Waterlevel
-sinfo.export.flow_depth.pdf.header.waterlevel = Water-level
+sinfo.export.flow_depth.pdf.header.waterlevel = Waterlevel
sinfo.export.flow_depth.csv.header.discharge = Q
sinfo.export.collision.csv.header.discharge_long = Discharge
common.export.csv.header.mainvalue_label = Description
@@ -957,10 +957,10 @@
sinfo.export.flood_duration.csv.header.duration = Flooding Duration [d/a]
sinfo.export.flood_duration.csv.header.discharge = Flooding Duration Discharge Q
sinfo.export.flood_duration.csv.header.infrastructure_type = Infrastructure Type
-sinfo.export.flood_duration.pdf.header.duration = Flood-ing Dura-tion Dis-charge [d/a]
-sinfo.export.flood_duration.pdf.header.discharge = Flood-ing Dura-tion Dis-charge Q [m\u00b3/s]
-sinfo.export.flood_duration.pdf.header.infrastructure_type = Infra-struc-ture Type
-sinfo.export.flood_duration.pdf.header.infrastructure.height = Infra-struc-ture Height
+sinfo.export.flood_duration.pdf.header.duration = Flooding Duration Discharge [d/a]
+sinfo.export.flood_duration.pdf.header.discharge = Flooding Duration Discharge Q [m\u00b3/s]
+sinfo.export.flood_duration.pdf.header.infrastructure_type = Infrastruc-ture Type
+sinfo.export.flood_duration.pdf.header.infrastructure.height = Infrastruc-ture Height
sinfo.chart.flow_depth.section.title=h-Longitudinal Section
@@ -987,7 +987,7 @@
sinfo.export.tkh.calculation.formula = # Calculation Basis: GILL Equation (1971)
sinfo.export.tkh.csv.header.tkh = Transport Body Height
sinfo.export.tkh.csv.header.tkhkind = Classification of the River Bed
-sinfo.export.tkh.pdf.header.tkhkind = Classification of the River Bed
+sinfo.export.tkh.pdf.header.tkhkind = Classifica-tion of the River Bed
sinfo.export.tkh.soilkind.mobil = mobile
sinfo.export.tkh.soilkind.starr = fix
@@ -1038,7 +1038,7 @@
sinfo.flood_duration.header.fd_per_year_index = Flooding Duration WL{0} [d/a]
sinfo.flood_duration.header.pdf.fd_per_year_index = Flood-ing Dura-tion WL{0} [d/a]
sinfo.flood_duration.header.w_index = Waterlevel {0} [{1}]
-sinfo.flood_duration.header.pdf.w_index = Water-level {0}
+sinfo.flood_duration.header.pdf.w_index = Waterlevel {0}
sinfo.flood_duration.header.q_index = Q{0} [m\u00b3/s]
sinfo.export.flow_depth_minmax.csv.header.min = Minimum Flow Depth
@@ -1051,13 +1051,13 @@
bedqualityd50kmvaluefinder.empty = The bed quality (D50) does not contain any values for the selected calculation range and sounding year {0}
bedqualityd50kmvaluefinder.missing = Bed quality (D50) not available
-soilkindkmvaluefinder.empty = no soil kind available for the selected calculation range, calculation of transport body height not possible
-soilkindkmvaluefinder.missing = no soil kind available
+soilkindkmvaluefinder.empty = No soil kind available for the selected calculation range, calculation of transport body height not possible
+soilkindkmvaluefinder.missing = No soil kind available
-flowvelocitymodelkmvaluefinder.empty = no flow velocities available for the selected calculation range, calculation of transport body height not possible
-flowvelocitymodelkmvaluefinder.missing = no flow velocities available, calculation of transport body height not possible
+flowvelocitymodelkmvaluefinder.empty = No flow velocities available for the selected calculation range, calculation of transport body height not possible
+flowvelocitymodelkmvaluefinder.missing = No flow velocities available, calculation of transport body height not possible
-linearInterpolator.maxdistance = spatial discretisation exceeds {0}m, interpolation does not take place
+linearInterpolator.maxdistance = Spatial discretisation exceeds {0}m, interpolation does not take place
sinfo.export.csv.meta.header.sounding.current = ##METADATA SOUNDING current
sinfo.export.csv.meta.header.sounding.historical = ##METADATA SOUNDING historical
@@ -1066,9 +1066,9 @@
sinfo.export.csv.header.channel.width = Target Channel Width
sinfo.export.csv.header.channel.depth = Target Channel Depth
sinfo.export.csv.header.flowdepth.development = Flow Depth Development
-sinfo.export.pdf.header.flowdepth.development = Flow Depth Develop-ment
+sinfo.export.pdf.header.flowdepth.development = Flow Depth Development
sinfo.export.csv.header.flowdepth.development.per.year = Flow Depth Development per Year
-sinfo.export.pdf.header.flowdepth.development.per.year = Flow Depth Develop-ment per Year
+sinfo.export.pdf.header.flowdepth.development.per.year = Flow Depth Development per Year
sinfo.export.csv.header.waterlevel.difference = \u0394WL
sinfo.export.csv.header.mean_bed_height.difference = \u0394MBH
sinfo.export.csv.header.flowdepth.current = Flow Depth h-current
@@ -1077,7 +1077,7 @@
flowdepthdevelopmentcalculation.missingCurrentYear = Failed to determine date of current watterlevel ({0}), calculation not possible.
flowdepthdevelopmentcalculation.missingHistoricalYear = Failed to determine date of historical waterlevel ({0}), calculation not possible.
-abstractsinfocalculationresults.emptyResult = {0}: result set is empty, please check the data ranges of the input
+abstractsinfocalculationresults.emptyResult = {0}: Result set is empty, please check the data ranges of the input
flowdepthdevelopmentcalculation.yearDifferenceCurrent = Current Difference Pair
flowdepthdevelopmentcalculation.yearDifferenceHistorical = Historical Difference Pair
@@ -1085,8 +1085,8 @@
state.uinfo.inundation.vegetation=Classification of Vegetation Zones and Flooding Durations
state.uinfo.inundation.use_scenario=Scenario
state.uinfo.salix.load.scenario.regional = Waterlevel Changes
-state.uinfo.inundation.scenario.regional = Waterlevel Change Input (up to 5 input values)
-state.uinfo.inundation.scenario = Insert values for sounding or waterlevel changes
+state.uinfo.inundation.scenario.regional = Waterlevel Change Input (up to 5 Input Values)
+state.uinfo.inundation.scenario = Insert a value for sounding or waterlevel change
state.uinfo.salix.use_scenario=Scenario
useScenario.option = Also include Scenario?
useScenario.active = Active
@@ -1129,7 +1129,7 @@
help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.distance_only
help.state.uinfo.inundation.year_totalepoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.year_totalepoch
-uinfo_salix_line = Iota (River/Floodplain-Connectivity)
+uinfo_salix_line = Iota (River/Floodplain Connectivity)
uinfo_inundation_duration = Flood Duration Floodplain
uinfo_vegetation_zones = Vegetation Zones
uinfo_vegetation_type_1 = zonal forest
@@ -1160,11 +1160,11 @@
uinfo.export.csv.meta.header.salix.regional = ##Regional Effects
uinfo.export.csv.meta.header.salix.supraregional = ##Supraregional Effects
uinfo.export.csv.meta.header.salix.teilabschnitt = # Sub-range: {0}
-uinfo.export.csv.meta.header.salix.supraregional.Sub-range = # Sub-ranges: {0}
+uinfo.export.csv.meta.header.salix.supraregional.teilabschnitt = # Sub-ranges: {0}
uinfo.export.csv.meta.header.salix.mwspiegelaenderung = # Waterlevel Changes: {0}
uinfo.export.csv.meta.header.salix.historical = ##Historical View
uinfo.export.csv.meta.header.salix.historical.zeitpunkt = # Historical Time: {0}
-uinfo.export.csv.meta.header.veg.name = Vegetation Zones
+uinfo.export.csv.meta.header.veg.name = Vegetation Zone
uinfo.export.csv.meta.header.veg.dauervon = Flooding Duration from [d/a]
uinfo.export.csv.meta.header.veg.dauerbis = Flooding Duration to [d/a]
uinfo.export.csv.meta.header.veg.color = Color
@@ -1172,7 +1172,7 @@
uinfo.export.url.inundationduration.vegetation = Vegetation Zones ({0})
uinfo.export.url.inundationduration.vegetation_scenario= Vegetation Zones Scenario ({0}, {1}cm)
uinfo.export.url.inundationduration.scenario = Flooding Duration Scenario ({0}, {1}cm)
-uinfo.chart.salix_line.section.title = Iota (River/Floodplain-Connectivity) - Longitudinal Section
+uinfo.chart.salix_line.section.title = Iota (River/Floodplain Connectivity) - Longitudinal Section
uinfo.chart.salix_line.section.yaxis.label = [m]
uinfo_facet_salix_line = Iota
uinfo_facet_salix_line.filtered.description = Iota
@@ -1257,7 +1257,7 @@
state.bundu.calculation.mode = Calculation Mode
state.bundu.location = Distance
state.bundu.period = Period
-state.bundu.gaugerange = Discharge Sectors
+state.bundu.gaugerange = Discharge Class
state.bundu.eventselect = Event selection
state.bundu.analysis.referenceperiod = Reference period
state.bundu.analysis.analysisperiods = Analysis period
@@ -1267,10 +1267,10 @@
state.bundu.vollmer.function=Function
state.bundu.vollmer.preprocessing = Outliers
state.bundu.vollmer.qs = Input for W/Q data
-state.bundu.wst.gaugerange = Discharge Sectors
+state.bundu.wst.gaugerange = Discharge Class
state.bundu.wst.eventselect = Event selection
state.bundu.wst.location = Distance
-state.bundu.wst.yearselect = Bezugsjahr
+state.bundu.wst.yearselect = Reference Year
state.bundu.wst.fix.auto = Automatic Choice
state.bundu.wst.fix.manual = Manual Choice
state.bundu.wst.fixationchoice = Fixations
@@ -1332,8 +1332,8 @@
chart.subtitle.metadata.user = User: {0}
chart.subtitle.metadata.creationdate = Time of Creation: {0}
-state.title.distance_state = Choose calculation range [km]
-state.title.location_distance_state = Choose calculation location(s) / range [km]
+state.title.distance_state = Choose Calculation Range [km]
+state.title.location_distance_state = Choose Calculation Location(s)/Range [km]
state.title.distance_part_state = Select Sub-range
state.title.salix.historical.distance_part_state = Select Sub-range
state.title.uinfo.bezugswst.miss_vol.distance_part_state = Choose sub-range for the missing depths to be calculated [km]
diff -r 05e572a944c8 -r 45908b79c079 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties Thu Sep 06 15:25:01 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties Thu Sep 06 18:02:02 2018 +0200
@@ -14,7 +14,7 @@
state.winfo.uesk.profiles = Interpolierte Profile
state.winfo.uesk.floodplain = Laterale Begrenzung
state.winfo.uesk.differences = Differenzen zwischen Wasserspiegellage und Gel\u00e4nde
-state.winfo.uesk.scenario = \u00dcberschwemmungsfl\u00e4che / Szenario
+state.winfo.uesk.scenario = \u00dcberschwemmungsfl\u00e4che/Szenario
state.winfo.uesk.dc-hws = Hochwasserschutzanlagen
state.winfo.uesk.user-rgd = Benutzerdefinierte Shapefiles
state.winfo.uesk.barriers = Benutzerdefinierte Hochwasserschutzanlagen
@@ -104,7 +104,7 @@
year=Jahr
epoch=Epoche
off_epoch = Amtl. Epoche
-soundings = Peilungen / Epochen
+soundings = Peilungen/Epochen
t_per_a = t/a
m3_per_a = m\u00b3/a
@@ -453,7 +453,7 @@
export.flow_velocity.csv.header.tau_main = Sohlschubspannung Hauptgerinne [N/m\u00b2]
export.flow_velocity.csv.header.locations = Streckendaten
export.bedheight_middle.csv.header.km = Fluss-km
-export.bedheight_middle.csv.header.sounding = Peilung / Epoche
+export.bedheight_middle.csv.header.sounding = Peilung/Epoche
export.bedheight_middle.csv.header.height = gemittelte Sohlh\u00f6he [{0}]
export.bedheight_middle.csv.header.uncertainty = Unsicherheit [m]
export.bedheight_middle.csv.header.datagap = Datenl\u00fccke
@@ -1086,7 +1086,7 @@
state.uinfo.inundation.use_scenario=Szenariobetrachtung
state.uinfo.salix.load.scenario.regional = \u00c4nderungen der MW-Spiegellage
state.uinfo.inundation.scenario.regional = Eingabe der \u00c4nderung der Mittelwasserspiegellage (bis zu 5 Werte m\u00f6glich)
-state.uinfo.inundation.scenario = Werte f\u00fcr \u00c4nderung der Sohl- bzw. Mittelwasserlage eingeben
+state.uinfo.inundation.scenario = Wert f\u00fcr \u00c4nderung der Sohl- bzw. Mittelwasserlage eingeben
state.uinfo.salix.use_scenario=Szenariobetrachtung
useScenario.option = Zus\u00e4tzlich Szenariobetrachtung miteinbeziehen?
useScenario.active = Ja
@@ -1164,7 +1164,7 @@
uinfo.export.csv.meta.header.salix.mwspiegelaenderung = # MittelwasserSpiegellagen\u00e4nderung: {0}
uinfo.export.csv.meta.header.salix.historical = ##Historische Betrachtung
uinfo.export.csv.meta.header.salix.historical.zeitpunkt = # Historischer Zeitpunkt: {0}
-uinfo.export.csv.meta.header.veg.name = Vegetationszonen
+uinfo.export.csv.meta.header.veg.name = Vegetationszone
uinfo.export.csv.meta.header.veg.dauervon = \u00dcberflutungsdauer von [d/a]
uinfo.export.csv.meta.header.veg.dauerbis = \u00dcberflutungsdauer bis [d/a]
uinfo.export.csv.meta.header.veg.color = Farbe
@@ -1333,7 +1333,7 @@
chart.subtitle.metadata.creationdate = Datum der Erstellung: {0}
state.title.distance_state = Berechnungsstrecke w\u00e4hlen [km]
-state.title.location_distance_state = Berechnungsort(e) / strecke w\u00e4hlen [km]
+state.title.location_distance_state = Berechnungsort(e)/-strecke w\u00e4hlen [km]
state.title.distance_part_state = Festlegen eines Teilabschnitts
state.title.salix.historical.distance_part_state = Festlegen eines Teilabschnitts
state.title.uinfo.bezugswst.miss_vol.distance_part_state = Strecke der zu ermittelnden Fehltiefen w\u00e4hlen [km]
diff -r 05e572a944c8 -r 45908b79c079 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Thu Sep 06 15:25:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Thu Sep 06 18:02:02 2018 +0200
@@ -1604,4 +1604,14 @@
String bundu_wspl_longitudinal_section();
String bundu_depth_longitudinal_section();
+
+ String gauge_list_grid_gauge();
+
+ String gauge_list_grid_station();
+
+ String gauge_list_grid_info();
+
+ String gauge_list_grid_start();
+
+ String gauge_list_grid_end();
}
\ No newline at end of file
diff -r 05e572a944c8 -r 45908b79c079 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Sep 06 15:25:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Sep 06 18:02:02 2018 +0200
@@ -9,7 +9,7 @@
clone_project = Clone Project
copy_of = Copy
manage_projects = Manage Projects
-projectlist_creationTime = Creation time
+projectlist_creationTime = Creation Time
projectlist_title = Title
projectlist_favorite = Permanent
projectlist_close = Close
@@ -26,7 +26,7 @@
datetime_format = yyyy-MM-dd HH:mm
new_project = New Project
module_selection = Module
-river_selection = Rivers
+river_selection = River
winfo = W-INFO
minfo = M-INFO
new_map = New Map
@@ -51,7 +51,7 @@
show_legend = Show
aggregation_threshold = Threshold for aggregation of legend entries
scale = Scale
-databasket = Databasket
+databasket = Data Cage
databasket_loading = Loading Databasket content
databasket_empty = Databasket is empty
fix = Fixing
@@ -70,7 +70,7 @@
activateTheme = Activate
deactivateTheme = Deactivate
removeTheme = Remove
-manageThemes = Manage themes
+manageThemes = Manage Themes
label_ok = Ok
label_cancel = Cancel
cancelCalculationLabel = Stop the current calculation.
@@ -133,21 +133,21 @@
addPointsTooltip = Add manual points
addWSPTooltip = Add manual LS
-downloadPNGTooltip = Download chart as PNG
-downloadPDFTooltip = Download chart as PDF
-downloadSVGTooltip = Download chart as SVG
-downloadCSVTooltip = Download data as CSV
-zoomToMaxExtentTooltip = Zoom to max extent
-zoomOutTooltip = Zoom out
-historyBackTooltip = Previous zoom
+downloadPNGTooltip = Download Chart as PNG
+downloadPDFTooltip = Download Chart as PDF
+downloadSVGTooltip = Download Chart as SVG
+downloadCSVTooltip = Download Data as CSV
+zoomToMaxExtentTooltip = Zoom to Max Extent
+zoomOutTooltip = Zoom Out
+historyBackTooltip = Previous Zoom
panControlTooltip = Pan
-zoomboxTooltip = Zoombox
-chartPropertiesTooltip = Chartproperties
+zoomboxTooltip = Zoom Box
+chartPropertiesTooltip = Chart Properties
printTooltip = Print
description = Description
-from = From
-to = To
+from = from
+to = to
riverside = Riverside
bottom_edge = Bottom edge
top_edge = Top edge
@@ -157,7 +157,7 @@
stoptime = Stop Time
wq_table_w = Characteristic Waterlevels
wq_waterlevel_label = Characteristic Waterlevel
-wq_table_q = Characteristic Discharges / Durations
+wq_table_q = Characteristic Discharges/Durations
wq_value_w = W [cm at Gauge]
wq_value_q = Q [m\u00b3/s]
river_km = River-Km
@@ -178,9 +178,9 @@
wqW = W at Gauge [cm]
wqQ = Q [m\u00b3/s]
wqQatGauge = Q at Gauge [m\u00b3/s]
-wqWFree = W free position [m+NHN]
+wqWFree = W Free Position [m+NHN]
wqQGauge = Discharge at Gauge
-wqSingle = Single values
+wqSingle = Single Values
wqRange = Range
unitWNN = W [NN+m]
unitWSingle = cm
@@ -214,7 +214,7 @@
zoom_out = images/mag_zoom_minus.png
zoom_back = images/mag_zoom_back.png
pan = images/hand.png
-askThemeRemove = Are you sure that you want to remove the selected theme / themes?
+askThemeRemove = Are you sure that you want to remove the selected theme/themes?
add = Add
static_sqrelation = SQ relation
@@ -260,7 +260,7 @@
fix_longitudinal_section_curve = \u0394W Longitudinal Section
fix_derivate_curve = Derivate
fix_vollmer_wq_curve = W/Q-Diagram
-datacage_add_pair = Add difference pair
+datacage_add_pair = Add Difference Pair
load_diameter = Bedload Diameter
bed_diameter = Bed Diameter
soundings = Soundings
@@ -289,7 +289,7 @@
computed_dischargecurve_at_export = Discharge Curve Export
gauge_discharge_curve_at_export = Gauge Discharge Curve
current_gauge = Current Gauge Discharge Curve
-gauge_class = Gauge Class
+gauge_class = Discharge Class
eventselect = Event Selection
events = Events
kmchart = W/Q-Preview
@@ -519,7 +519,7 @@
bfg_model = BfG-Model
federal = Federal States
areas = Areas
-sobek_flooded = SOBEK-Boundary flooded / not flooded
+sobek_flooded = SOBEK-Boundary flooded/not flooded
sobek_areas = SOBEK-Areas
measurements = Measurements
floodmarks = Flood Marks
@@ -530,9 +530,9 @@
wlevel = Waterlevels
sedimentloads = Sedimentloads
sources_sinks = sources_sinks
-years = years
-epochs = epochs
-off_epochs = official epochs
+years = Years
+epochs = Epochs
+off_epochs = Official Epochs
densities = Sediment Densities
years_general = years
@@ -692,13 +692,14 @@
gauge_zero = GZG
gauge_q_unit = m\u00b3/s
+#Links are also form-names and must not contain whitespaces!
gauge_river_info_link = Riverinfo
gauge_info_link = Gaugeinfo
gauge_url = /PegelInfo/
gauge_river_url = /GewaesserInfo/
-gauge_curve_link = model dischargecurve/-table
-discharge_timeranges = DC-Timeranges
-discharge_chart = W/Q-Preview
+gauge_curve_link = Model Discharge Curve/Table
+discharge_timeranges = DC Time Series
+discharge_chart = W/Q Preview
measurement_station_type = Type of Measurement Station
measurement_station_operator = Operator
@@ -745,15 +746,15 @@
WATERBODY = Waterbody
FEDSTATE_KM = Station (Federal State)
-official_regulation = official Regulation
+official_regulation = Official Regulation
negative_values_not_allowed_for_to=No negative numbers allowed for 'to'.
reference_gauge=Reference gauge
gauge_name=Gauge
-station=Number of measurement station
+station=Number of Measurement Station
-station_name=Measurement station
+station_name=Measurement Station
river=River
@@ -848,7 +849,7 @@
bundu = Operation and Maintenance
bundu_bezugswst_fix_choice_title= Fixation Choice
-bundu_bezugswst_auto_event_choice = Automatic Event choice
+bundu_bezugswst_auto_event_choice = Automatic Event Choice
bundu_bezugswst_mode_ud = DNE at Gauge [d/a]
bundu_bezugswst_validation_range = Input must be an integer between 0 and 364.
bundu_wst_export = Reference Waterlevels Export
@@ -859,9 +860,14 @@
chart_settings_export_metadata = Show Metadata
export_csv_title = Title:
-sinfo_columnlabel_soundings = Sounding choice
-sinfo_columnlabel_waterlevels = Waterlevel choice
+sinfo_columnlabel_soundings = Sounding Choice
+sinfo_columnlabel_waterlevels = Waterlevel Choice
sinfo_sounding_waterlevel_select_waterlevel = Please choose a sounding first.
-sinfo_deactivate_intelligent_datacage = Disable intelligent data cage
+sinfo_deactivate_intelligent_datacage = Disable Intelligent Data Cage
-naviThemeOutOfRange = out of range
\ No newline at end of file
+naviThemeOutOfRange = out of range
+gauge_list_grid_gauge = Gauge
+gauge_list_grid_station = Station [km]
+gauge_list_grid_info = Info
+gauge_list_grid_start = Start [km]
+gauge_list_grid_end = End [km]
\ No newline at end of file
diff -r 05e572a944c8 -r 45908b79c079 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Sep 06 15:25:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Sep 06 18:02:02 2018 +0200
@@ -157,7 +157,7 @@
stoptime = Reihe bis
wq_table_w = Kennzeichnende Wasserst\u00e4nde
wq_waterlevel_label = Kennzeichnender Wassterstand
-wq_table_q = Kennzeichnende Abfl\u00fcsse / Dauerzahlen
+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
@@ -214,7 +214,7 @@
zoom_out = images/mag_zoom_minus.png
zoom_back = images/mag_zoom_back.png
pan = images/hand.png
-askThemeRemove = Sind Sie sicher, dass sie die gew\u00e4hlten / das gew\u00e4lte Thema l\u00f6schen wollen?
+askThemeRemove = Sind Sie sicher, dass sie die gew\u00e4hlten/das gew\u00e4lte Thema l\u00f6schen wollen?
add = Hinzuf\u00fcgen
static_sqrelation = Transport-Abfluss Beziehung
@@ -519,7 +519,7 @@
bfg_model = BfG-Modell
federal = Bundesl\u00e4nder
areas = Darstellungstyp: Fl\u00e4chen
-sobek_flooded = SOBEK-Grenzlinie durchflutet / nicht durchflutet
+sobek_flooded = SOBEK-Grenzlinie durchflutet/nicht durchflutet
sobek_areas = SOBEK-Bereiche
measurements = Messungen
floodmarks = HW-Marken
@@ -692,6 +692,7 @@
gauge_zero = PNP
gauge_q_unit = m\u00b3/s
+#Links are also form-names and must not contain whitespaces!
gauge_river_info_link = Gew\u00e4sserinfo
gauge_info_link = Pegelinfo
gauge_url = /PegelInfo/
@@ -864,4 +865,9 @@
sinfo_sounding_waterlevel_select_waterlevel = W\u00e4hlen Sie zuerst eine Peilung
sinfo_deactivate_intelligent_datacage = Intelligente Datenkorbfilterung ausschalten
-naviThemeOutOfRange = au\u00dferh. G\u00fcltigkeitsb.
\ No newline at end of file
+naviThemeOutOfRange = au\u00dferh. G\u00fcltigkeitsb.
+gauge_list_grid_gauge = Pegel
+gauge_list_grid_station = Station [km]
+gauge_list_grid_info = Info
+gauge_list_grid_start = Start [km]
+gauge_list_grid_end = Ende [km]
\ No newline at end of file
diff -r 05e572a944c8 -r 45908b79c079 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java Thu Sep 06 15:25:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java Thu Sep 06 18:02:02 2018 +0200
@@ -69,12 +69,12 @@
public GaugeListGrid(final FLYS flys) {
super(flys);
- // TODO i18n!!!
- final ListGridField nfield = new ListGridField("name", "Pegel");
- final ListGridField sfield = new ListGridField("kmstart", "Start [km]", 60);
- final ListGridField efield = new ListGridField("kmend", "Ende [km]", 60);
- final ListGridField stfield = new ListGridField("station", "Station [km]");
- final ListGridField lfield = new ListGridField("infolink", "Info");
+
+ final ListGridField nfield = new ListGridField("name", this.MSG.gauge_list_grid_gauge());
+ final ListGridField sfield = new ListGridField("kmstart", this.MSG.gauge_list_grid_start(), 60);
+ final ListGridField efield = new ListGridField("kmend", this.MSG.gauge_list_grid_end(), 60);
+ final ListGridField stfield = new ListGridField("station", this.MSG.gauge_list_grid_station());
+ final ListGridField lfield = new ListGridField("infolink", this.MSG.gauge_list_grid_info());
final ListGridField cfield = new ListGridField("curvelink", this.MSG.gauge_curve_link());
cfield.addRecordClickHandler(this);
@@ -210,11 +210,10 @@
}
if (!locations.isEmpty()) {
openOnLocations(locations);
- } else if( this.data != null && this.data.length == 1 ){
+ } else if (this.data != null && this.data.length == 1) {
// During selection of calc-mode: all gauges should be collapsed
collapseAll();
- }
- else {
+ } else {
openAll();
}
}
@@ -231,9 +230,9 @@
}
private void collapseAll() {
-
+
GWT.log("InfoListGrid - openAll");
-
+
setData(new ListGridRecord[] {});
for (final GaugeInfo gauge : this.gauges) {
addCollapsedRecord(gauge);
@@ -295,29 +294,29 @@
setData(new ListGridRecord[] {});
- double to = end == null ? Double.MAX_VALUE: end;
+ double to = end == null ? Double.MAX_VALUE : end;
- double from = Math.min(start, to);
+ final double from = Math.min(start, to);
to = Math.max(start, to);
-
+
for (final GaugeInfo gauge : this.gauges) {
/* in earlier version, it was assumed that gaugeEnd may be null, but start not. */
final Double gaugeStart = gauge.getKmStart();
final Double gaugeEnd = gauge.getKmEnd() == null ? gaugeStart : gauge.getKmEnd();
-
+
boolean expand;
- if( gaugeStart == null )
+ if (gaugeStart == null)
expand = false;
else {
-
+
final double gaugeFrom = Math.min(gaugeStart, gaugeEnd);
final double gaugeTo = Math.max(gaugeStart, gaugeEnd);
-
+
expand = (from >= gaugeFrom && from <= gaugeTo) || (to >= gaugeFrom && to <= gaugeTo) || (from <= gaugeFrom && to >= gaugeEnd);
}
- if( expand )
+ if (expand)
addExpandedRecord(gauge);
else
removeOrCollapse(gauge, type);
More information about the Dive4Elements-commits
mailing list