From abb07911f412772c565f9cd07d9634597de23af1 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 2 Sep 2021 10:59:44 +0200
Subject: [PATCH] corrected "}" at end of error message ("... has to be set if
editing is enabled.")
---
.../Implementation/InterimStageBusVehicleViewModel_v2_8.cs | 6 +++---
.../Implementation/MultistageAuxiliariesViewModel.cs | 4 ++--
.../MultiStage/Implementation/StageViewModelBase.cs | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 43e4465b42..ff7190924f 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -1185,7 +1185,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
case nameof(PredictiveCruiseControlNullable):
case nameof(ATEcoRollReleaseLockupClutch):
if (AdasEditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null){
- result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
break;
default:
@@ -1193,12 +1193,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
var propertyValue = this.GetType().GetProperty(propertyName)?.GetValue(this);
if (propertyValue == null) {
result =
- $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
} else {
if (propertyValue.GetType() == typeof(string) && string.IsNullOrWhiteSpace(propertyValue as string))
{
result =
- $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
}
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index 99eb26c631..711b9bce5e 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -632,13 +632,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
case nameof(SystemConfiguration):
if (HeatPumpGroupEditingEnabled == true &&
this.GetType().GetProperty(propertyName).GetValue(this) == null) {
- result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
break;
default:
if (_parameterViewModels[propertyName].EditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null)
{
- result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
break;
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
index a4284ead66..3bb13847a8 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
@@ -154,7 +154,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
var dialogHelper = _multistageDependencies.DialogHelper;
if (VehicleViewModel.HasErrors) {
- var errorMessage = "Vehicle\n";
+ var errorMessage = "Vehicle:\n";
var vehicleErrorInfo = VehicleViewModel as IDataErrorInfo;
errorMessage += vehicleErrorInfo.Error.Replace(",", "\n");
@@ -163,7 +163,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
VehicleViewModel.MultistageAuxiliariesViewModel as IDataErrorInfo;
if (auxiliariesErrorInfo != null &&
!auxiliariesErrorInfo.Error.IsNullOrEmpty()) {
- errorMessage += "\n Auxiliaries \n";
+ errorMessage += "\nAuxiliaries:\n";
errorMessage += auxiliariesErrorInfo.Error.Replace(",", "\n");
}
--
GitLab