--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java	Mon Oct 20 12:23:11 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java	Mon Oct 20 13:48:51 2014 +0200
@@ -9,6 +9,7 @@
 package org.dive4elements.river.artifacts.states;
 
 import java.util.List;
+import java.util.Date;
 
 import java.text.DateFormat;
 
@@ -33,7 +34,6 @@
 import org.dive4elements.river.artifacts.resources.Resources;
 
 import org.dive4elements.river.model.Gauge;
-import org.dive4elements.river.model.DischargeTable;
 import org.dive4elements.river.model.TimeInterval;
 
 import org.dive4elements.river.utils.Formatter;
@@ -69,24 +69,17 @@
         }
 
         Gauge gauge = artifact.getGauge();
-        DischargeTable mdt = gauge.fetchMasterDischargeTable();
-        TimeInterval validity = mdt.getTimeInterval();
-        DateFormat df = Formatter.getDateFormatter(meta, "dd.MM.yyyy");
-        String start = validity.getStartTime() != null ?
-                         df.format(validity.getStartTime()) : "Unknown";
-        String stop = validity.getStopTime() != null ?
-                          df.format(validity.getStopTime()) : "";
-
-        Object[] args = new Object[] {
-            gauge.getName(),
-            start,
-            stop
-        };
-
+        TimeInterval validity = gauge.fetchMasterDischargeTable()
+            .getTimeInterval();
+        Date stopTime = validity.getStopTime();
         String name = Resources.getMsg(
             meta,
-            "chart.computed.discharge.curve.gauge",
-            args);
+            "chart.discharge.curve.model" + (stopTime != null ? "" : ".nostop"),
+            new Object[] {gauge.getName(),
+                          validity.getStartTime(),
+                          stopTime
+                }
+        );
 
         return name;
     }