diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculation.java @ 9479:2b83d3a96703

i18n TODO "benutzerdefiniert" = "custom" fixed
author gernotbelger
date Mon, 10 Sep 2018 15:31:55 +0200
parents 9744ce3c3853
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculation.java	Mon Sep 10 14:21:36 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculation.java	Mon Sep 10 15:31:55 2018 +0200
@@ -10,6 +10,7 @@
 
 import java.util.List;
 
+import org.dive4elements.artifacts.CallMeta;
 import org.dive4elements.river.artifacts.access.FixRealizingAccess;
 import org.dive4elements.river.artifacts.math.fitting.Function;
 import org.dive4elements.river.artifacts.model.CalculationResult;
@@ -17,6 +18,7 @@
 import org.dive4elements.river.artifacts.model.RiverFactory;
 import org.dive4elements.river.artifacts.model.Segment;
 import org.dive4elements.river.artifacts.model.WQKms;
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.model.River;
 
 /** Calculation for FixRealize (german: ausgel. WSPL). */
@@ -60,7 +62,7 @@
     }
 
     @Override
-    protected CalculationResult innerCalculate(final FixingsOverview overview, final Function func) {
+    protected CalculationResult innerCalculate(final FixingsOverview overview, final Function func, final CallMeta meta) {
         final ColumnCache cc = new ColumnCache();
         final FitResult fitResult = doFitting(overview, cc, func);
 
@@ -119,8 +121,9 @@
         }
 
         // Name the curves.
+        final String custom = Resources.getMsg(meta, "common.custom");
         for (int i = 0; i < results.length; ++i)
-            results[i].setName(createName(i));
+            results[i].setName(createName(i, custom));
 
         final FixRealizingResult frr = new FixRealizingResult(parameters, fitResult.getResultColumns(), results);
 
@@ -128,10 +131,9 @@
     }
 
     // TODO: issue1109/2
-    protected String createName(final int index) {
-        // TODO: i18n
+    protected String createName(final int index, final String custom) {
         final StringBuilder sb = new StringBuilder(this.isQ ? "Q" : "W");
-        sb.append(" benutzerdefiniert (");
+        sb.append(" ").append(custom).append(" (");
         for (int i = 0, N = this.segments.size(); i < N; ++i) {
             if (i > 0) {
                 sb.append("; ");

http://dive4elements.wald.intevation.org