# HG changeset patch # User Christian Lins # Date 1348413827 0 # Node ID bd0f5a50e194aa1be7f00d5c3b3ccee1b14f20f4 # Parent 9a2c38fb5f29e22204c906a1ca2bec7da152bba4 Theming and i18n of Delta W/t A1/B facets flys-artifacts/trunk@5575 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 9a2c38fb5f29 -r bd0f5a50e194 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/ChangeLog Sun Sep 23 15:23:47 2012 +0000 @@ -1,3 +1,10 @@ +2012-09-23 Christian Lins + + * doc/conf/second-themes.xml, + doc/conf/default-themes.xml, + src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: + Themes and i18n of Delta W/t's A1/B facets (#876). + 2012-09-23 Christian Lins * doc/conf/artifacts/fixanalysis.xml, diff -r 9a2c38fb5f29 -r bd0f5a50e194 flys-artifacts/doc/conf/default-themes.xml --- a/flys-artifacts/doc/conf/default-themes.xml Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/doc/conf/default-themes.xml Sun Sep 23 15:23:47 2012 +0000 @@ -1468,6 +1468,8 @@ + diff -r 9a2c38fb5f29 -r bd0f5a50e194 flys-artifacts/doc/conf/second-themes.xml --- a/flys-artifacts/doc/conf/second-themes.xml Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/doc/conf/second-themes.xml Sun Sep 23 15:23:47 2012 +0000 @@ -1479,6 +1479,8 @@ + diff -r 9a2c38fb5f29 -r bd0f5a50e194 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Sun Sep 23 15:23:47 2012 +0000 @@ -1,9 +1,11 @@ package de.intevation.flys.exports.fixings; import java.io.OutputStream; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -355,14 +357,18 @@ return; } + Locale locale = Resources.getLocale(context.getMeta()); + NumberFormat nf = NumberFormat.getInstance(locale); + List textAnnos = new ArrayList(); Set> entries = annoIdxMap.entrySet(); for(Map.Entry entry : entries) { int[] idxs = entry.getValue(); double x = tsc.getXValue(idxs[0], idxs[1]); + XYTextAnnotation anno = new CollisionFreeXYTextAnnotation( - qwd.getQ() + " m\u00B3/s", + nf.format(qwd.getQ()) + " m\u00B3/s", x, qwd.getDeltaW()); textAnnos.add(anno);