Mercurial > dive4elements > gnv-client

changeset 189:af354567b421

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Conformation to the tanslation of the MeshObjects issue53 gnv-artifacts/trunk@236 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Fri, 16 Oct 2009 15:26:22 +0000
parents 693f7b676ade
children baaa1618fa27
files gnv-artifacts/ChangeLog gnv-artifacts/src/main/resources/lang/artifactMessages.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties gnv-artifacts/src/test/ressources/conf.xml gnv-artifacts/src/test/ressources/timeseries_mesh/timeseries_step_05_feed.xml
diffstat 7 files changed, 23 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Oct 16 15:26:22 2009 +0000
@@ -1,3 +1,10 @@
+2009-10-16  Tim Englich  <tim.englich@intevation.de>
+
+	* src/test/ressources/timeseries_mesh/timeseries_step_05_feed.xml: 
+	  src/test/ressources/conf.xml: 
+	  src/main/resources/lang/artifactMessages*.properties: 
+	  Conformation to the tanslation of the MeshObjects  issue53
+
 2009-10-16  Tim Englich  <tim.englich@intevation.de>
 
 	* src/test/ressources/queries.properties: 
@@ -8,7 +15,7 @@
 	  Adding two further FIS to the Configuration which are based on Meshes.
 	  Added the Sourceid to the ModelData issue49
 	* src/main/resources/lang/artifactMessages*.properties:
-	  Adding the Names of tne two new FIS to the  Propertiesfiles issue49
+	  Adding the Names of the two new FIS to the  Propertiesfiles issue49
 
 2009-10-16  Tim Englich  <tim.englich@intevation.de>
 	
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Fri Oct 16 15:26:22 2009 +0000
@@ -17,8 +17,8 @@
 verticalProfile = Verticalprofile
 horizontalProfile = Horizontalprofile
 featureid = Object
-mesh_coordinate = Position (e.g. 56n30 6e20)
-mesh_point = Meshpoint
+mesh_coordinate = Geographic position (e.g. 56n30 6e20)
+mesh_point = Mesh Point
 measurementid = Measurement depth
 parameterid = Parameter
 minvalue = Minvalue
@@ -30,7 +30,7 @@
 seriesid = Series
 surveyid = Survey Info
 axisid = Axis
-depthid = Depth
+depthid = Layer and Depth range [m]
 iposition = I-Achse
 jposition = J-Achse
 instantaneouspoint_point = Momentanmesspunkt
\ No newline at end of file
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Fri Oct 16 15:26:22 2009 +0000
@@ -30,7 +30,7 @@
 seriesid = Serie
 surveyid = Messinformation
 axisid = Achse
-depthid = Tiefe
+depthid = Ebene und Tiefenbereich [m]
 iposition = I-Achse
 jposition = J-Achse
 instantaneouspoint_point = Momentanmesspunkt
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Fri Oct 16 15:26:22 2009 +0000
@@ -30,7 +30,7 @@
 seriesid = Serie
 surveyid = Messinformation
 axisid = Achse
-depthid = Tiefe
+depthid = Ebene und Tiefenbereich [m]
 iposition = I-Achse
 jposition = J-Achse
 instantaneouspoint_point = Momentanmesspunkt
\ No newline at end of file
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Fri Oct 16 15:26:22 2009 +0000
@@ -17,8 +17,8 @@
 verticalProfile = Verticalprofile
 horizontalProfile = Horizontalprofile
 featureid = Object
-mesh_coordinate = Position (e.g. 56n30 6e20)
-mesh_point = Meshpoint
+mesh_coordinate = Geographic position (e.g. 56n30 6e20)
+mesh_point = Mesh Point
 measurementid = Measurement depth
 parameterid = Parameter
 minvalue = Minvalue
@@ -30,7 +30,7 @@
 seriesid = Series
 surveyid = Survey Info
 axisid = Axis
-depthid = Depth
+depthid = Layer and Depth range [m]
 iposition = I-Axis
 jposition = J-Axis
 instantaneouspoint_point = Instantaneouspoint
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/conf.xml	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/conf.xml	Fri Oct 16 15:26:22 2009 +0000
@@ -282,7 +282,7 @@
                 
                 <transition id="timeseries_meshpoint_depth" description="timeseries_meshpoint_depth" transition="de.intevation.gnv.transition.DefaultTransition">
                     <queryID>timeseries_meshpoint_depth</queryID>
-                    <dataname>measurementid</dataname>
+                    <dataname>depthid</dataname>
                     <data-multiselect>true</data-multiselect>
                     <reachableTransitions>
                         <transition>timeseries_meshpoint_parameter</transition>v
@@ -303,7 +303,7 @@
                     </reachableTransitions>
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
-                         <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="0"/>
+                         <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
@@ -319,7 +319,7 @@
                     <inputvalues>
                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                          <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
-                         <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="0"/>
+                         <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/>
                     </inputvalues>
@@ -331,7 +331,7 @@
                         <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/>
-                         <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="1"/>
+                         <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                          <inputvalue name="minvalue" type="Date" multiselect="false" usedinquery="1"/>
                          <inputvalue name="maxvalue" type="Date" multiselect="false" usedinquery="1"/>
@@ -340,7 +340,7 @@
                       <value-names>
                         <value-name name="feature" value="mesh_point"></value-name>
                         <value-name name="parameter" value="parameterid"></value-name>
-                        <value-name name="measurement" value="measurementid"></value-name>
+                        <value-name name="measurement" value="depthid"></value-name>
                     </value-names>
                     <outputsModes>
                         <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png">
--- a/gnv-artifacts/src/test/ressources/timeseries_mesh/timeseries_step_05_feed.xml	Fri Oct 16 14:51:43 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/timeseries_mesh/timeseries_step_05_feed.xml	Fri Oct 16 15:26:22 2009 +0000
@@ -4,7 +4,7 @@
 	<art:uuid value="1e9f6583-9073-4409-aac1-432ad06d7ce1" />
 	<art:hash value="29913235" />
 	<art:data>
-		<art:input name="measurementid" value="2003771" />
-		<art:input name="measurementid" value="2012198" />
+		<art:input name="depthid" value="2003771" />
+		<art:input name="depthid" value="2012198" />
 	</art:data>
 </art:action>
\ No newline at end of file
http://dive4elements.wald.intevation.org