Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit abb07911 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

corrected "}" at end of error message ("... has to be set if editing is enabled.")

parent c0687f29
No related branches found
No related tags found
No related merge requests found
......@@ -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.";
}
}
}
......
......@@ -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;
}
......
......@@ -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");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment