Mercurial > dive4elements > river

changeset 8172:f2bbe09e516e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix fraction respectively facet names and descriptions.
author "Tom Gottfried <tom@intevation.de>"
date Mon, 01 Sep 2014 12:34:39 +0200
parents bb770daccd1d
children 16be0ceee25b
files artifacts/doc/conf/artifacts/minfo.xml artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.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 7 files changed, 18 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/minfo.xml	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/doc/conf/artifacts/minfo.xml	Mon Sep 01 12:34:39 2014 +0200
@@ -499,22 +499,22 @@
                     <facets>
                         <facet name="sedimentload.ta.coarse"/>
                         <facet name="sedimentload.ta.sand"/>
-                        <facet name="sedimentload.ta.finemiddle"/>
+                        <facet name="sedimentload.ta.fine_middle"/>
                         <facet name="sedimentload.ta.susp_sand"/>
                         <facet name="sedimentload.ta.susp_sand_bed"/>
-                        <facet name="sedimentload.ta.susp_sediment"/>
-                        <facet name="sedimentload.ta.total_load"/>
-                        <facet name="sedimentload.ta.unknown"/>
+                        <facet name="sedimentload.ta.suspended_sediment"/>
                         <facet name="sedimentload.ta.total"/>
+                        <facet name="sedimentload.ta.bed_load"/>
+                        <facet name="sedimentload.ta.bed_load_susp_sand"/>
                         <facet name="sedimentload.m3a.coarse"/>
                         <facet name="sedimentload.m3a.sand"/>
-                        <facet name="sedimentload.m3a.finemiddle"/>
+                        <facet name="sedimentload.m3a.fine_middle"/>
                         <facet name="sedimentload.m3a.susp_sand"/>
                         <facet name="sedimentload.m3a.susp_sand_bed"/>
-                        <facet name="sedimentload.m3a.susp_sediment"/>
-                        <facet name="sedimentload.m3a.total_load"/>
-                        <facet name="sedimentload.m3a.unknown"/>
+                        <facet name="sedimentload.m3a.suspended_sediment"/>
                         <facet name="sedimentload.m3a.total"/>
+                        <facet name="sedimentload.m3a.bed_load"/>
+                        <facet name="sedimentload.m3a.bed_load_susp_sand"/>
                         <facet name="sedimentload_ls.manualpoints"/>
                         <facet name="flow_velocity.totalchannel" description="A facet for total channels"/>
                         <facet name="flow_velocity.mainchannel" description="A facet for main channels"/>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java	Mon Sep 01 12:34:39 2014 +0200
@@ -121,10 +121,7 @@
         // Grain fraction names are alignt to the grain_fractions table
         GrainFraction.make("total",              TOTAL_LOAD_FLYS),
         GrainFraction.make("bed_load",           BED_LOAD_FLYS),
-        GrainFraction.make("susp_sand_bed",      BED_LOAD_SUSP_SAND_FLYS),
-        GrainFraction.make("total.bfg",          TOTAL_LOAD_BFG),
-        GrainFraction.make("bed_load.bfg",       BED_LOAD_BFG),
-        GrainFraction.make("suspended_load.bfg", SUSPENDED_LOAD_BFG),
+        GrainFraction.make("bed_load_susp_sand", BED_LOAD_SUSP_SAND_FLYS),
         GrainFraction.make("coarse",             COARSE_FLYS),
         GrainFraction.make("fine_middle",        FINE_MIDDLE_FLYS),
         GrainFraction.make("sand",               SAND_FLYS) ,
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java	Mon Sep 01 12:34:39 2014 +0200
@@ -79,11 +79,10 @@
            from simple fractions from the database */
         String isCalculated = fraction_name.equals("total") ||
             fraction_name.equals("bed_load") ||
-            fraction_name.equals("suspended_load") ? "calc." : "";
+            fraction_name.equals("bed_load_susp_sand") ? "calc." : "";
         description = Resources.getMsg(
                 meta,
                 "facet.sedimentload." + isCalculated + fraction_name,
-                "Error: please add l10n for facet.sedimentload." + fraction_name,
                 new Object[] { periodString, i18nUnit });
 
         /* Is this necessary? */
--- a/artifacts/src/main/resources/messages.properties	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/src/main/resources/messages.properties	Mon Sep 01 12:34:39 2014 +0200
@@ -271,9 +271,9 @@
 facet.sedimentload.total = Total load (from database) - {0} [{1}]
 facet.sedimentload.bed_load = Bed load (from database) - {0} [{1}]
 facet.sedimentload.suspended_load = Suspended load (from database) - {0} [{1}]
-facet.sedimentload.calc.total = Gesamtfracht (calculated) - {0} [{1}]
-facet.sedimentload.calc.bed_load = Geschiebefracht (calculated) - {0} [{1}]
-facet.sedimentload.calc.suspended_load = Suspensionsfracht (calculated) - {0} [{1}]
+facet.sedimentload.calc.total = Total load (calculated) - {0} [{1}]
+facet.sedimentload.calc.bed_load = Bed load (calculated) - {0} [{1}]
+facet.sedimentload.calc.bed_load_susp_sand = bed building load (calculated) - {0} [{1}]
 
 missing.fraction.coarse = Year {0}: Missing coarse fraction
 missing.fraction.fine_middle = Year {0}: Missing fine/middle fraction
--- a/artifacts/src/main/resources/messages_de.properties	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Mon Sep 01 12:34:39 2014 +0200
@@ -274,7 +274,7 @@
 facet.sedimentload.suspended_load = Suspensionsfracht (Berechnung BfG) - {0} [{1}]
 facet.sedimentload.calc.total = Gesamtfracht (Berechnung FLYS) - {0} [{1}]
 facet.sedimentload.calc.bed_load = Geschiebefracht (Berechnung FLYS) - {0} [{1}]
-facet.sedimentload.calc.suspended_load = Suspensionsfracht (Berechnung FLYS) - {0} [{1}]
+facet.sedimentload.calc.bed_load_susp_sand = bettbildende Fracht (Berechnung FLYS) - {0} [{1}]
 
 missing.fraction.coarse = Jahr {0}: Fehlende Fraktion: grober Kies
 missing.fraction.fine_middle = Jahr {0}: Fehlende Fraktion: fein/mittlerer Kies
--- a/artifacts/src/main/resources/messages_de_DE.properties	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Mon Sep 01 12:34:39 2014 +0200
@@ -271,7 +271,7 @@
 facet.sedimentload.suspended_load = Suspensionsfracht (Berechnung BfG) - {0} [{1}]
 facet.sedimentload.calc.total = Gesamtfracht (Berechnung FLYS) - {0} [{1}]
 facet.sedimentload.calc.bed_load = Geschiebefracht (Berechnung FLYS) - {0} [{1}]
-facet.sedimentload.calc.suspended_load = Suspensionsfracht (Berechnung FLYS) - {0} [{1}]
+facet.sedimentload.calc.bed_load_susp_sand = bettbildende Fracht (Berechnung FLYS) - {0} [{1}]
 
 missing.fraction.coarse = Jahr {0}: Fehlende Fraktion: grober Kies
 missing.fraction.fine_middle = Jahr {0}: Fehlende Fraktion: fein/mittlerer Kies
--- a/artifacts/src/main/resources/messages_en.properties	Mon Sep 01 10:15:57 2014 +0200
+++ b/artifacts/src/main/resources/messages_en.properties	Mon Sep 01 12:34:39 2014 +0200
@@ -273,9 +273,9 @@
 facet.sedimentload.total = Total load (from database) - {0} [{1}]
 facet.sedimentload.bed_load = Bed load (from database) - {0} [{1}]
 facet.sedimentload.suspended_load = Suspended load (from database) - {0} [{1}]
-facet.sedimentload.calc.total = Gesamtfracht (calculated) - {0} [{1}]
-facet.sedimentload.calc.bed_load = Geschiebefracht (calculated) - {0} [{1}]
-facet.sedimentload.calc.suspended_load = Suspensionsfracht (calculated) - {0} [{1}]
+facet.sedimentload.calc.total = Total load (calculated) - {0} [{1}]
+facet.sedimentload.calc.bed_load = Bed load (calculated) - {0} [{1}]
+facet.sedimentload.calc.bed_load_susp_sand = bed building load (calculated) - {0} [{1}]
 
 missing.fraction.coarse = Year {0}: Missing coarse fraction
 missing.fraction.fine_middle = Year {0}: Missing fine/middle fraction
http://dive4elements.wald.intevation.org