warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes string interpolation

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:07:43 -07:00
parent 42d0b6271f
commit 7d3a0ca265
233 changed files with 758 additions and 690 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Engines/Reports/Rendering/HtmlRenderer.cs
View file

@ -105,7 +105,7 @@ namespace Server.Engines.Reports
ProcessStartInfo psi = new ProcessStartInfo();
psi.FileName = "ftp";
psi.Arguments = String.Format( "-i -s:\"{0}\"", filePath );
psi.Arguments = $"-i -s:\"{filePath}\"";
psi.CreateNoWindow = true;
psi.WindowStyle = ProcessWindowStyle.Hidden;
@ -298,7 +298,8 @@ namespace Server.Engines.Reports
html.Write( "<!-- " );
html.AddAttribute( HtmlAttr.Href, "#" );
html.AddAttribute( HtmlAttr.Onclick, String.Format( "javascript:window.open('{0}.html','ChildWindow','width={1},height={2},resizable=no,status=no,toolbar=no')", SafeFileName( FindNameFrom( chart ) ), bmp.Width+30,bmp.Height+80 ) );
html.AddAttribute( HtmlAttr.Onclick,
$"javascript:window.open('{SafeFileName(FindNameFrom(chart))}.html','ChildWindow','width={bmp.Width + 30},height={bmp.Height + 80},resizable=no,status=no,toolbar=no')");
html.RenderBeginTag( HtmlTag.A );
html.Write( chart.Name );
html.RenderEndTag();
@ -393,7 +394,8 @@ namespace Server.Engines.Reports
html.Write( "<!-- " );
html.AddAttribute( HtmlAttr.Href, "#" );
html.AddAttribute( HtmlAttr.Onclick, String.Format( "javascript:window.open('{0}.html','ChildWindow','width={1},height={2},resizable=no,status=no,toolbar=no')", SafeFileName( FindNameFrom( graph ) ), bmp.Width+30,bmp.Height+80 ) );
html.AddAttribute( HtmlAttr.Onclick,
$"javascript:window.open('{SafeFileName(FindNameFrom(graph))}.html','ChildWindow','width={bmp.Width + 30},height={bmp.Height + 80},resizable=no,status=no,toolbar=no')");
html.RenderBeginTag( HtmlTag.A );
html.Write( graph.Name );
html.RenderEndTag();

2
Scripts/Engines/Reports/Rendering/PieChartRenderer.cs
View file

@ -141,7 +141,7 @@ namespace Server.Engines.Reports
}
float perc = (item.SweepSize * 100.0f) / 360.0f;
string percString = String.Format( "{0:F0}%", perc );
string percString = $"{perc:F0}%";
float px = pieRect.X+(pieRect.Width/2);
float py = pieRect.Y+(pieRect.Height/2);

4
Scripts/Engines/Reports/Reports.cs
View file

@ -404,9 +404,9 @@ namespace Server.Engines.Reports
if ( pl.Faction.Commander == pl.Mobile )
office = "Commanding Lord";
else if ( pl.Finance != null )
office = String.Format( "{0} Finance Minister", pl.Finance.Definition.FriendlyName );
office = $"{pl.Finance.Definition.FriendlyName} Finance Minister";
else if ( pl.Sheriff != null )
office = String.Format( "{0} Sheriff", pl.Sheriff.Definition.FriendlyName );
office = $"{pl.Sheriff.Definition.FriendlyName} Sheriff";
else
office = "";