remove format codes from brake status localizations

YoRyan · YoRyan · commit 1bfa466cb3e7 · 2021-03-22T13:16:45.000-07:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
@@ -123,30 +123,20 @@ public override void InitializeFromCopy(BrakeSystem copy)
         // Get the brake BC & BP for EOT conditions
         public override string GetStatus(Dictionary<BrakeSystemComponent, PressureUnit> units)
         {
-            string s = string.Format(
-                Simulator.Catalog.GetString(" BC {0}"),
-                FormatStrings.FormatPressure(CylPressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true));
-                s += string.Format(Simulator.Catalog.GetString(" BP {0}"), FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true));
-            return s;
+            return $" {Simulator.Catalog.GetString("BC")} {FormatStrings.FormatPressure(CylPressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true)}"
+                + $" {Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true)}";
         }
 
         // Get Brake information for train
         public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<BrakeSystemComponent, PressureUnit> units)
         {
-            string s = string.Format(Simulator.Catalog.GetString(" EQ {0}"), FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.PSI, units[BrakeSystemComponent.EqualizingReservoir], true));
-            s += string.Format(
-                Simulator.Catalog.GetString(" BC {0}"),
-                FormatStrings.FormatPressure(Car.Train.HUDWagonBrakeCylinderPSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true)
-            );
-
-            s += string.Format(
-                Simulator.Catalog.GetString(" BP {0}"),                
-                FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true)
-            );
+            var s = $" {Simulator.Catalog.GetString("EQ")} {FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.PSI, units[BrakeSystemComponent.EqualizingReservoir], true)}"
+                + $" {Simulator.Catalog.GetString("BC")} {FormatStrings.FormatPressure(Car.Train.HUDWagonBrakeCylinderPSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true)}"
+                + $" {Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true)}";
             if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)
-                s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);
+                s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";
             if (HandbrakePercent > 0)
-                s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);
+                s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";
             return s;
         }
 
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
@@ -63,9 +63,9 @@ public override void Update(float elapsedClockSeconds)
 
         public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<BrakeSystemComponent, PressureUnit> units)
         {
-            string s = string.Format(Simulator.Catalog.GetString(" BC {0}"), FormatStrings.FormatPressure(CylPressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true));
+            var s = $" {Simulator.Catalog.GetString("BC")} {FormatStrings.FormatPressure(CylPressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true)}";
             if (HandbrakePercent > 0)
-                s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);
+                s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";
             return s;
         }
     }
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
@@ -72,11 +72,11 @@ public override string GetStatus(Dictionary<BrakeSystemComponent, PressureUnit>
             // display differently depending upon whether vacuum or air braked system
             if (Car.CarBrakeSystemType == "vacuum_piped")
             {
-                return string.Format(Simulator.Catalog.GetString(" BP {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false));
+                return $" {Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false)}";
             }
             else  // air braked by default
             {
-                return string.Format(Simulator.Catalog.GetString("BP {0}"), FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true));
+                return $"{Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true)}";
             }
         }
 
@@ -85,20 +85,20 @@ public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<
             // display differently depending upon whether vacuum or air braked system
             if (Car.CarBrakeSystemType == "vacuum_piped")
             {
-                string s = string.Format(Simulator.Catalog.GetString(" V {0}"), FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.InHg, PressureUnit.InHg, true));
+                var s = $" {Simulator.Catalog.GetString("V")} {FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.InHg, PressureUnit.InHg, true)}";
                 if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)
-                    s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);
+                    s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";
                 if (HandbrakePercent > 0)
-                    s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);
+                    s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";
                 return s;
             }
             else // air braked by default
             {
-                var s = string.Format(Simulator.Catalog.GetString("BP {0}"), FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], false));
+                var s = $"{Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], false)}";
                 if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)
-                    s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);
+                    s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";
                 if (HandbrakePercent > 0)
-                    s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);
+                    s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";
                 return s;
             }
             
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
@@ -109,9 +109,7 @@ protected float VacResPressureAdjPSIA()
         }
 
         public override string GetStatus(Dictionary<BrakeSystemComponent, PressureUnit> units) // Status for last car in Main HUD
-        {
-            return string.Format(Simulator.Catalog.GetString(" BP {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false));
-        }
+            => $" {Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false)}";
 
         public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<BrakeSystemComponent, PressureUnit> units)  // Status for Main HUD view (calls above as well)
         {
@@ -128,19 +126,19 @@ protected float VacResPressureAdjPSIA()
 
                 float DisplayEqualReservoirPressurePSIorInHg = (ValveFraction * (OneAtmospherePSI - (OneAtmospherePSI - MaxVacuumPipeLevelPSI))) + (OneAtmospherePSI - MaxVacuumPipeLevelPSI);
 
-                s = string.Format(Simulator.Catalog.GetString(" EQ {0}"), FormatStrings.FormatPressure(Vac.FromPress(DisplayEqualReservoirPressurePSIorInHg), PressureUnit.InHg, PressureUnit.InHg, true));
-                s += string.Format(Simulator.Catalog.GetString(" V {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true));
+                s = $" {Simulator.Catalog.GetString("EQ")} {FormatStrings.FormatPressure(Vac.FromPress(DisplayEqualReservoirPressurePSIorInHg), PressureUnit.InHg, PressureUnit.InHg, true)}"
+                    + $" {Simulator.Catalog.GetString("V")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true)}";
             }
             else // No EQ reservoir by default
             {
-                s = string.Format(Simulator.Catalog.GetString(" Lead BP {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true));
+                s = $" {Simulator.Catalog.GetString("Lead BP")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true)}";
             }
 
             //            string s = string.Format(" V {0}", FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.InHg, PressureUnit.InHg, true));
             if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)
-                s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);
+                s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";
             if (HandbrakePercent > 0)
-                s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);
+                s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";
             return s;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ public override void Update(float elapsedClockSeconds)`
`63`	`63`
`64`	`64`	`public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<BrakeSystemComponent, PressureUnit> units)`
`65`	`65`	`{`
`66`		`- string s = string.Format(Simulator.Catalog.GetString(" BC {0}"), FormatStrings.FormatPressure(CylPressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true));`
	`66`	`+ var s = $" {Simulator.Catalog.GetString("BC")} {FormatStrings.FormatPressure(CylPressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakeCylinder], true)}";`
`67`	`67`	`if (HandbrakePercent > 0)`
`68`		`- s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);`
	`68`	`+ s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";`
`69`	`69`	`return s;`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ public override string GetStatus(Dictionary<BrakeSystemComponent, PressureUnit>`
`72`	`72`	`// display differently depending upon whether vacuum or air braked system`
`73`	`73`	`if (Car.CarBrakeSystemType == "vacuum_piped")`
`74`	`74`	`{`
`75`		`- return string.Format(Simulator.Catalog.GetString(" BP {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false));`
	`75`	`+ return $" {Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false)}";`
`76`	`76`	`}`
`77`	`77`	`else // air braked by default`
`78`	`78`	`{`
`79`		`- return string.Format(Simulator.Catalog.GetString("BP {0}"), FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true));`
	`79`	`+ return $"{Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], true)}";`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`@@ -85,20 +85,20 @@ public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<`
`85`	`85`	`// display differently depending upon whether vacuum or air braked system`
`86`	`86`	`if (Car.CarBrakeSystemType == "vacuum_piped")`
`87`	`87`	`{`
`88`		`- string s = string.Format(Simulator.Catalog.GetString(" V {0}"), FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.InHg, PressureUnit.InHg, true));`
	`88`	`+ var s = $" {Simulator.Catalog.GetString("V")} {FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.InHg, PressureUnit.InHg, true)}";`
`89`	`89`	`if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)`
`90`		`- s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);`
	`90`	`+ s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";`
`91`	`91`	`if (HandbrakePercent > 0)`
`92`		`- s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);`
	`92`	`+ s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";`
`93`	`93`	`return s;`
`94`	`94`	`}`
`95`	`95`	`else // air braked by default`
`96`	`96`	`{`
`97`		`- var s = string.Format(Simulator.Catalog.GetString("BP {0}"), FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], false));`
	`97`	`+ var s = $"{Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(BrakeLine1PressurePSI, PressureUnit.PSI, units[BrakeSystemComponent.BrakePipe], false)}";`
`98`	`98`	`if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)`
`99`		`- s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);`
	`99`	`+ s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";`
`100`	`100`	`if (HandbrakePercent > 0)`
`101`		`- s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);`
	`101`	`+ s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";`
`102`	`102`	`return s;`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,7 @@ protected float VacResPressureAdjPSIA()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public override string GetStatus(Dictionary<BrakeSystemComponent, PressureUnit> units) // Status for last car in Main HUD`
`112`		`- {`
`113`		`- return string.Format(Simulator.Catalog.GetString(" BP {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false));`
`114`		`- }`
	`112`	`+ => $" {Simulator.Catalog.GetString("BP")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, false)}";`
`115`	`113`
`116`	`114`	`public override string GetFullStatus(BrakeSystem lastCarBrakeSystem, Dictionary<BrakeSystemComponent, PressureUnit> units) // Status for Main HUD view (calls above as well)`
`117`	`115`	`{`
`@@ -128,19 +126,19 @@ protected float VacResPressureAdjPSIA()`
`128`	`126`
`129`	`127`	`float DisplayEqualReservoirPressurePSIorInHg = (ValveFraction * (OneAtmospherePSI - (OneAtmospherePSI - MaxVacuumPipeLevelPSI))) + (OneAtmospherePSI - MaxVacuumPipeLevelPSI);`
`130`	`128`
`131`		`- s = string.Format(Simulator.Catalog.GetString(" EQ {0}"), FormatStrings.FormatPressure(Vac.FromPress(DisplayEqualReservoirPressurePSIorInHg), PressureUnit.InHg, PressureUnit.InHg, true));`
`132`		`- s += string.Format(Simulator.Catalog.GetString(" V {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true));`
	`129`	`+ s = $" {Simulator.Catalog.GetString("EQ")} {FormatStrings.FormatPressure(Vac.FromPress(DisplayEqualReservoirPressurePSIorInHg), PressureUnit.InHg, PressureUnit.InHg, true)}"`
	`130`	`+ + $" {Simulator.Catalog.GetString("V")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true)}";`
`133`	`131`	`}`
`134`	`132`	`else // No EQ reservoir by default`
`135`	`133`	`{`
`136`		`- s = string.Format(Simulator.Catalog.GetString(" Lead BP {0}"), FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true));`
	`134`	`+ s = $" {Simulator.Catalog.GetString("Lead BP")} {FormatStrings.FormatPressure(Vac.FromPress(BrakeLine1PressurePSI), PressureUnit.InHg, PressureUnit.InHg, true)}";`
`137`	`135`	`}`
`138`	`136`
`139`	`137`	`// string s = string.Format(" V {0}", FormatStrings.FormatPressure(Car.Train.EqualReservoirPressurePSIorInHg, PressureUnit.InHg, PressureUnit.InHg, true));`
`140`	`138`	`if (lastCarBrakeSystem != null && lastCarBrakeSystem != this)`
`141`		`- s += Simulator.Catalog.GetString(" EOT ") + lastCarBrakeSystem.GetStatus(units);`
	`139`	`+ s += $" {Simulator.Catalog.GetString("EOT")} {lastCarBrakeSystem.GetStatus(units)}";`
`142`	`140`	`if (HandbrakePercent > 0)`
`143`		`- s += string.Format(Simulator.Catalog.GetString(" Handbrake {0:F0}%"), HandbrakePercent);`
	`141`	`+ s += $" {Simulator.Catalog.GetString("Handbrake")} {HandbrakePercent:F0}%";`
`144`	`142`	`return s;`
`145`	`143`	`}`
`146`	`144`