Index: DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml =================================================================== diff -u -r5098 -r6318 --- DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml (.../Translations.xml) (revision 5098) +++ DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml (.../Translations.xml) (revision 6318) @@ -123,4 +123,9 @@ + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs =================================================================== diff -u -r6314 -r6318 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6314) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6318) @@ -415,23 +415,6 @@ } } } - - public void TransferInputTimeSerieToLocationJobs() - { - if (InputTimeSerieCollection == null) - { - return; - } - - foreach (LocationJob locationJob in LocationJobs) - { - TimeSerie timeSerie = InputTimeSerieCollection.Series.FirstOrDefault(serie => serie.LocationId == locationJob.Location.Name); - if (timeSerie != null) - { - locationJob.WaterLevelTimeSerie = timeSerie; - } - } - } public LocationJob GetFirstLocationJobWithCalamityResults() { Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationChart.cs =================================================================== diff -u -r4539 -r6318 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationChart.cs (.../LocationChart.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationChart.cs (.../LocationChart.cs) (revision 6318) @@ -24,6 +24,7 @@ using System.Windows.Forms; using Deltares.Dam.Data; using Deltares.Standard.EventPublisher; +using Deltares.Standard.Language; using DevExpress.Utils; using DevExpress.XtraCharts; @@ -90,8 +91,8 @@ if (((XYDiagram) chartControl1.Diagram).SecondaryAxesY.Count == 0) { - ((XYDiagram) chartControl1.Diagram).SecondaryAxesY.Add(new SecondaryAxisY("Water level")); - ((XYDiagram) chartControl1.Diagram).SecondaryAxesY[0].Title.Text = "Water level"; + ((XYDiagram) chartControl1.Diagram).SecondaryAxesY.Add(new SecondaryAxisY(LocalizationManager.GetTranslatedText(GetType(),"WaterLevel"))); + ((XYDiagram) chartControl1.Diagram).SecondaryAxesY[0].Title.Text = LocalizationManager.GetTranslatedText(GetType(),"WaterLevel"); ((XYDiagram) chartControl1.Diagram).SecondaryAxesY[0].Title.Visibility = DefaultBoolean.True; } @@ -110,14 +111,14 @@ { var diagram = ((XYDiagram) chartControl1.Diagram); - diagram.AxisY.Title.Text = "Failure"; + diagram.AxisY.Title.Text = LocalizationManager.GetTranslatedText(GetType(), "SafetyFactor"); diagram.AxisY.Title.Visibility = DefaultBoolean.True; - diagram.AxisX.Title.Text = "Time (" + locationJob.Name + ")"; + diagram.AxisX.Title.Text = LocalizationManager.GetTranslatedText(GetType(),"Time") + " (" + locationJob.Name + ")"; diagram.AxisX.Title.Visibility = DefaultBoolean.True; diagram.AxisX.DateTimeScaleOptions.MeasureUnit = DateTimeMeasureUnit.Minute; - diagram.AxisX.Label.TextPattern = "dd/MM/yyyy hh:mm"; + diagram.AxisX.Label.TextPattern = "{A:dd/MM/yyyy hh:mm}"; diagram.AxisX.Label.Staggered = true; } } @@ -139,7 +140,7 @@ constantLine.Visible = true; constantLine.LineStyle.Thickness = 2; constantLine.Color = Color.DarkGray; - constantLine.LegendText = "Current view"; + constantLine.LegendText = LocalizationManager.GetTranslatedText(GetType(),"CurrentView"); diagram.AxisX.ConstantLines.Add(constantLine); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r6314 -r6318 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6314) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6318) @@ -95,7 +95,6 @@ } } damProjectData.TransferOutputTimeSerieToLocationJobs(); - damProjectData.TransferInputTimeSerieToLocationJobs(); return damProjectData; }