[PATCH] zu pos 20 little fixes
Wald Commits
scm-commit at wald.intevation.org
Tue Nov 12 10:07:20 CET 2019
# HG changeset patch
# User dnt_bjoernsen <d.tironi at bjoernsen.de>
# Date 1573549629 -3600
# Tue Nov 12 10:07:09 2019 +0100
# Node ID 68d7b09a47b7ae8786b725a338ddac398c6d911c
# Parent df668014016e4f717f1a0cc07a9e865cc7981497
zu pos 20 little fixes
diff -r df668014016e -r 68d7b09a47b7 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Tue Nov 12 09:24:07 2019 +0100
+++ b/artifacts/doc/conf/meta-data.xml Tue Nov 12 10:07:09 2019 +0100
@@ -1415,7 +1415,7 @@
</dc:macro>
<dc:macro name="predefined_infrastructures">
- <sinfo.flood_duration.infrastructures>
+ <sinfo_flood_duration_infrastructures>
<dc:choose>
<dc:when test="dc:contains($riverside, 'left')">
<dc:context connection="system">
@@ -1440,16 +1440,16 @@
</dc:context>
</dc:otherwise>
</dc:choose>
- </sinfo.flood_duration.infrastructures>
+ </sinfo_flood_duration_infrastructures>
</dc:macro>
<dc:macro name="infrastructures_groups_fill">
<dc:group expr="$group_label">
<infrastructure_group name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <!-- name="{$annotation_type_id}" -->
- <!-- not necessary: target_out="{$out}" -->
- <infrastructure_type name="{$type_label}" description="{$filename}" factory="FAKE_FACTORY" group_label="{$group_label}" group_id="{$group_id}" type_id="{$type_id}" type_label="{$type_label}" />
+ <!--target_out MUST BE DEFINED -->
+ <infrastructure_type name="{$type_label}" factory="FAKE_FACTORY" target_out="{$out}" description="{$filename}"
+ group_label="{$group_label}" group_id="{$group_id}" type_id="{$type_id}" type_label="{$type_label}" />
</dc:for-each>
</infrastructure_group>
</dc:group>
diff -r df668014016e -r 68d7b09a47b7 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Tue Nov 12 09:24:07 2019 +0100
+++ b/artifacts/src/main/resources/messages.properties Tue Nov 12 10:07:09 2019 +0100
@@ -1070,7 +1070,6 @@
sinfo.flood_duration.absolute.height.right = Absolute Height Infrastructures BWaStr (right)
sinfo.flood_duration.infrastructures.left = Flooding Durations Infrastructures BWaStr (left)
sinfo.flood_duration.infrastructures.right = Flooding Durations Infrastructures BWaStr (right)
-sinfo.flood_duration.infrastructures=Infrastructures
sinfo.export.flow_depth_minmax.csv.header.min = Minimum Flow Depth
sinfo.export.flow_depth_minmax.csv.header.max = Maximum Flow Depth
diff -r df668014016e -r 68d7b09a47b7 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties Tue Nov 12 09:24:07 2019 +0100
+++ b/artifacts/src/main/resources/messages_de.properties Tue Nov 12 10:07:09 2019 +0100
@@ -1070,7 +1070,6 @@
sinfo.flood_duration.absolute.height.right = Absolute H\u00f6he Infrastrukturen BWaStr (rechts)
sinfo.flood_duration.infrastructures.left = \u00dcberflutungsdauern Infrastrukturen BWaStr (links)
sinfo.flood_duration.infrastructures.right = \u00dcberflutungsdauern Infrastrukturen BWaStr (rechts)
-sinfo.flood_duration.infrastructures=Infrastrukturen
sinfo.export.flow_depth_minmax.csv.header.min = Minimale Flie\u00dftiefe
sinfo.export.flow_depth_minmax.csv.header.max = Maximale Flie\u00dftiefe
diff -r df668014016e -r 68d7b09a47b7 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 Tue Nov 12 09:24:07 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Tue Nov 12 10:07:09 2019 +0100
@@ -1622,4 +1622,6 @@
String vegetation_zones(); // Order für Datenkorb
String uinfo_inundation_scenario_old_msg();
+
+ String sinfo_flood_duration_infrastructures();
}
\ No newline at end of file
diff -r df668014016e -r 68d7b09a47b7 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 Tue Nov 12 09:24:07 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Tue Nov 12 10:07:09 2019 +0100
@@ -821,6 +821,7 @@
sinfo_flood_duration = Flooding Durations of Infrastructures in BWaStr
sinfo_flood_height = Height of Infrastructures in BWaStr
sinfo_floodduration_curve = Flooding Durations of Infrastructures in BWaStr - Duration Curve
+sinfo_flood_duration_infrastructures=Infrastructures
uinfo = U-INFO
uinfo_salix_dmwspl_short = \u0394MW [cm]
diff -r df668014016e -r 68d7b09a47b7 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 Tue Nov 12 09:24:07 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Tue Nov 12 10:07:09 2019 +0100
@@ -821,6 +821,7 @@
sinfo_flood_duration = \u00dcberflutungsdauer Infrastrukturen BWaStr
sinfo_flood_height = H\u00f6he Infrastrukturen BWaStr
sinfo_floodduration_curve = \u00dcberflutungsdauer Infrastrukturen BWaStr - Dauerlinie
+sinfo_flood_duration_infrastructures=Infrastrukturen
uinfo = U-INFO
uinfo_salix_dmwspl_short = \u0394MW [cm]
More information about the Dive4Elements-commits
mailing list