[PATCH 2 of 2] Use description from database for i18n (completed revision dc8910e29dd4)
Wald Commits
scm-commit at wald.intevation.org
Fri May 16 13:18:38 CEST 2014
# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1400239049 -7200
# Node ID f9e3ef5d38d0c3de4070b6118cc9066f02e5e2f4
# Parent a575eaae78997c19720578cea55c993853d05b95
Use description from database for i18n (completed revision dc8910e29dd4).
diff -r a575eaae7899 -r f9e3ef5d38d0 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Fri May 16 13:14:52 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml Fri May 16 13:17:29 2014 +0200
@@ -1348,7 +1348,7 @@
factory="porosity"
target_out="{$out}"
info="{$description}"
- ids="{$pid}" />
+ ids="{$pid};{$description}" />
</dc:for-each>
</dc:if>
</dc:context>
diff -r a575eaae7899 -r f9e3ef5d38d0 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFacet.java Fri May 16 13:14:52 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFacet.java Fri May 16 13:17:29 2014 +0200
@@ -76,14 +76,22 @@
String code = D4EArtifact.getDatacageIDValue(data);
+ String[] split = code.split(";");
+ String id = split[0];
+ String desc = "";
+ if (split.length >= 2) {
+ desc = split[1];
+ }
+
if (code != null) {
this.name = NAME;
this.description = Resources.getMsg(
callMeta,
"facet.porosity",
- "Porosity");
+ "Porosity",
+ new Object[] { desc });
D4EArtifact d4e = (D4EArtifact) artifact;
- d4e.addStringData("porosity_id", code);
+ d4e.addStringData("porosity_id", id);
}
}
}
More information about the Dive4Elements-commits
mailing list