[Dive4elements-commits] [PATCH 2 of 3] Fixed i18n string to have the correct unit in y axis

Wald Commits scm-commit at wald.intevation.org
Thu Jun 6 18:10:45 CEST 2013


# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1370534961 -7200
# Node ID 70ae55f7bc557b7119ff885d20fe1dd262fee421
# Parent  a782693e4d5fe56edb887c9f3f29cb37ce4b5af2
Fixed i18n string to have the correct unit in y axis.

diff -r a782693e4d5f -r 70ae55f7bc55 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Thu Jun 06 18:08:27 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Thu Jun 06 18:09:21 2013 +0200
@@ -242,6 +242,7 @@
     @Override
     protected String getDefaultYAxisLabel(int pos) {
         String label = "default";
+        D4EArtifact flys = (D4EArtifact) master;
         if (pos == YAXIS.D.idx) {
             label = msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT);
         }
@@ -249,7 +250,6 @@
             label = msg(I18N_SECOND_YAXIS_LABEL, I18N_SECOND_YAXIS_LABEL_DEFAULT);
         }
         else if (pos == YAXIS.H.idx) {
-            D4EArtifact flys = (D4EArtifact) master;
             label = msg(I18N_THIRD_YAXIS_LABEL,
                 I18N_THIRD_YAXIS_LABEL_DEFAULT,
                 new Object[]
@@ -259,7 +259,9 @@
             label = msg(I18N_DW_YAXIS_LABEL, I18N_DW_YAXIS_LABEL_DEFAULT);
         }
         else if (pos == YAXIS.W.idx) {
-            return msg(I18N_W_YAXIS_LABEL, I18N_W_YAXIS_LABEL_DEFAULT);
+            return msg(I18N_W_YAXIS_LABEL, I18N_W_YAXIS_LABEL_DEFAULT,
+                new Object[]
+                    { RiverUtils.getRiver(flys).getWstUnit().getName() });
         }
 
         return label;


More information about the Dive4elements-commits mailing list