changeset 8114:84f42caeea2a

Reconstruct facet description of sediment load longitudinal sections. i18n will follow.
author "Tom Gottfried <tom@intevation.de>"
date Wed, 20 Aug 2014 17:47:58 +0200 (2014-08-20)
parents f5c0ed04f673
children 9a8ddd37a1a7
files artifacts/doc/conf/meta-data.xml artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSFacet.java
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Wed Aug 20 17:07:17 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Aug 20 17:47:58 2014 +0200
@@ -1432,7 +1432,7 @@
             factory="sedimentload_ls"
             target_out="{$out}"
             info="{$description}"
-            ids="{$syid}:{$syear}" />
+            ids="{$syid};{$syear}" />
     </dc:macro>
 
     <dc:macro name="epoch-load_ls">
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSFacet.java	Wed Aug 20 17:07:17 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSFacet.java	Wed Aug 20 17:47:58 2014 +0200
@@ -131,11 +131,15 @@
          * See issue 1681 for details. */
         name = NAME;
 
+        String i18nUnit = "";
+
         if (theLoad.getUnit().getName().equals("m3/a")) {
             /* unit_id is NOT NULL */
             name += ".m3a";
+            i18nUnit = "m\u00b3/a";
         } else {
             name += ".ta";
+            i18nUnit = "t/a";
         }
 
         String gfName;
@@ -152,7 +156,7 @@
                 callMeta,
                 "facet.sedimentload.ls." + gfName,
                 "Error: please add l10n for facet.sedimentload.ls." + gfName,
-                new Object[] { desc });
+                new Object[] { desc, i18nUnit });
         ((D4EArtifact)artifact).addStringData("load_id", idStr);
     }
 

http://dive4elements.wald.intevation.org