Skip to content

Commit 381fea8

Browse files
ipax77ipax77
authored
Merge pull request #535 from ipax77/dev
remove InvariantCulture on all frontend numbers
2 parents 5f4c8ac + d1733c3 commit 381fea8

31 files changed

+115
-139
lines changed

‎src/dsstats.db8services/Stats/CountService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ join rpr in context.RepPlayerRatings on rp.ReplayPlayerId equals rpr.ReplayPlaye
239239
Matchups = result.Sum(s => s.Matchups),
240240
LeaverReplays = result.Where(x => x.Leaver).Sum(s => s.Replays),
241241
Quits = result.Where(x => !x.NoQuit).Sum(s => s.Replays),
242-
Duration = result.Sum(s => s.Replays * s.AvgDuration) / sum
242+
Duration = sum == 0 ? 0 : result.Sum(s => s.Replays * s.AvgDuration) / sum
243243
};
244244
}
245245
}

‎src/dsstats.razorlib/Builds/AddPlayersModal.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@using dsstats.razorlib.Players
44
@using Microsoft.AspNetCore.Components.Web.Virtualization
55
@using dsstats.razorlib.Services
6-
@using System.Globalization
76
@using Microsoft.JSInterop
87
@inject IPlayerService playerService
98
@inject IRemoteToggleService remoteToggleService
@@ -146,8 +145,8 @@
146145
</td>
147146
<td class="border-start">@rating.PlayerRating.Games</td>
148147
<td class="text-warning">
149-
@(Request.ComboRating ? rating.ComboPlayerRating.Rating.ToString("N2", CultureInfo.InvariantCulture)
150-
: rating.PlayerRating.Rating.ToString("N2", CultureInfo.InvariantCulture))
148+
@(Request.ComboRating ? rating.ComboPlayerRating.Rating.ToString("N2")
149+
: rating.PlayerRating.Rating.ToString("N2"))
151150
</td>
152151
<td>
153152
@if (rating.PlayerRating.PlayerRatingChange != null)
@@ -159,7 +158,7 @@
159158
_ => rating.PlayerRating.PlayerRatingChange.Change30d
160159
};
161160
<span class="@(ratingChange >= 0 ? "bi bi-arrow-top text-success" : "bi bi-arrow-bottom text-danger")">
162-
@ratingChange.ToString("N2", CultureInfo.InvariantCulture)
161+
@ratingChange.ToString("N2")
163162
</span>
164163
}
165164
</td>

‎src/dsstats.razorlib/CmdrInfos/CmdrInfosComponent.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@using dsstats.razorlib.Replays
44
@using dsstats.shared
55
@using dsstats.shared.Interfaces
6-
@using System.Globalization
76
@using Microsoft.JSInterop
87
@inject ICmdrInfoService cmdrInfoService
98
@inject IReplaysService replayService
@@ -39,7 +38,7 @@
3938
<div class="ms-auto">
4039
&Oslash;
4140
<span class="@(avgGain < 0 ? "text-danger" : "text-success")">
42-
@avgGain.ToString("N2", CultureInfo.InvariantCulture)
41+
@avgGain.ToString("N2")
4342
</span>
4443
</div>
4544
</div>

‎src/dsstats.razorlib/CmdrInfos/CmdrPlayerInfoComponent.razor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@using dsstats.razorlib.Services
22
@using dsstats.shared
33
@using dsstats.shared.Extensions
4-
@using System.Globalization
54

65
<div class="table-responsive tableFixHead text-nowrap" style="max-height: 80vh; max-width: 900px;">
76
<table class="tptable table w-auto">
@@ -89,13 +88,13 @@
8988
}
9089
</span>
9190
</td>
92-
<td class="text-info">@info.Strength.ToString("N2", CultureInfo.InvariantCulture)</td>
91+
<td class="text-info">@info.Strength.ToString("N2")</td>
9392
<td>@info.Count</td>
9493
<td>@HelperService.GetPercentageString(info.Wins, info.Count)</td>
9594
<td class="text-warning">@info.AvgRating</td>
9695
<td class="@(info.AvgGain >= 0 ? "text-success" : "text-danger")">
9796
<span class="@(info.AvgGain >= 0 ? "oi oi-arrow-top" : "oi oi-arrow-bottom")"></span>
98-
@info.AvgGain.ToString("N2", CultureInfo.InvariantCulture)
97+
@info.AvgGain.ToString("N2")
9998
</td>
10099
<td>@info.TeamRating</td>
101100
</tr>

‎src/dsstats.razorlib/DsData/UnitDetailsComponent.razor‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@using System.Globalization
2-
@using dsstats.shared
1+
@using dsstats.shared
32

43
<div class="container-fluid">
54
<div class="card border-secondary @($"{(Unit.Abilities.Count + Unit.Weapons.Count + Unit.Upgrades.Count <= 1 ? "" : "d-inline-block")}")">
@@ -58,7 +57,7 @@
5857
}
5958
<tr>
6059
<td>Speed</td>
61-
<td>@Unit.Speed.ToString("N2", CultureInfo.InvariantCulture)</td>
60+
<td>@Unit.Speed.ToString("N2")</td>
6261
</tr>
6362
@if (Unit.MaxEnergy > 0)
6463
{
@@ -72,14 +71,14 @@
7271
</tr>
7372
<tr>
7473
<td>Energy Regeneration</td>
75-
<td>@Unit.EnergyRegen.ToString("N2", CultureInfo.InvariantCulture)</td>
74+
<td>@Unit.EnergyRegen.ToString("N2")</td>
7675
</tr>
7776
}
7877
@if (Unit.HealthRegen > 0)
7978
{
8079
<tr>
8180
<td>Health Regeneration</td>
82-
<td>@Unit.HealthRegen.ToString("N2", CultureInfo.InvariantCulture)</td>
81+
<td>@Unit.HealthRegen.ToString("N2")</td>
8382
</tr>
8483
}
8584
<tr>
@@ -111,13 +110,13 @@
111110
}
112111
else
113112
{
114-
@weapon.Range.ToString("N2", CultureInfo.InvariantCulture)
113+
@weapon.Range.ToString("N2")
115114
}
116115
</td>
117116
</tr>
118117
<tr>
119118
<td>Attack Speed</td>
120-
<td>@weapon.AttackSpeed.ToString("N2", CultureInfo.InvariantCulture)</td>
119+
<td>@weapon.AttackSpeed.ToString("N2")</td>
121120
</tr>
122121
<tr>
123122
<td>Damage</td>
@@ -187,7 +186,7 @@
187186
{
188187
<tr>
189188
<td>EnergyCost</td>
190-
<td>@ability.EnergyCost.ToString("N2", CultureInfo.InvariantCulture)</td>
189+
<td>@ability.EnergyCost.ToString("N2")</td>
191190
</tr>
192191
}
193192
<tr>
@@ -198,7 +197,7 @@
198197
{
199198
<tr>
200199
<td>AoeRadius</td>
201-
<td>@ability.AoeRadius.ToString("N2", CultureInfo.InvariantCulture)</td>
200+
<td>@ability.AoeRadius.ToString("N2")</td>
202201
</tr>
203202
}
204203
<tr>

‎src/dsstats.razorlib/Ih/IhComponent.razor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@using System.Globalization
2-
@using dsstats.razorlib.Replays
1+
@using dsstats.razorlib.Replays
32
@using dsstats.razorlib.Services
43

54
<div class="d-flex">
@@ -136,7 +135,7 @@
136135
{
137136
<div>
138137
<span class="@(replay.Exp2Win >= 0.5 ? "text-success" : "text-danger")">
139-
@((replay.Exp2Win.Value * 100).ToString("N0", CultureInfo.InvariantCulture))%
138+
@((replay.Exp2Win.Value * 100).ToString("N0"))%
140139
</span>
141140
</div>
142141
}

‎src/dsstats.razorlib/Ih/IhSessionComponent.razor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@using System.Globalization
2-
@using dsstats.razorlib.Replays
1+
@using dsstats.razorlib.Replays
32
@using dsstats.razorlib.Services
43
@using dsstats.shared
54
@using dsstats.shared.Interfaces
@@ -103,7 +102,7 @@
103102
{
104103
<div>
105104
<span class="@(replay.Exp2Win >= 0.5 ? "text-success" : "text-danger")">
106-
@((replay.Exp2Win.Value * 100).ToString("N0", CultureInfo.InvariantCulture))%
105+
@((replay.Exp2Win.Value * 100).ToString("N0"))%
107106
</span>
108107
</div>
109108
}

‎src/dsstats.razorlib/Players/ComboRatingsComponent.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@using dsstats.shared.Interfaces
44
@using Microsoft.AspNetCore.Components.Web.Virtualization
55
@using dsstats.razorlib.Services
6-
@using System.Globalization
76
@inject IPlayerService playerService
87
@inject IRemoteToggleService remoteToggleService
98

@@ -144,8 +143,8 @@
144143
</td>
145144
<td class="border-start">@rating.ComboPlayerRating.Games</td>
146145
<td class="text-warning">
147-
@(Request.ComboRating || Request.Arcade ? rating.ComboPlayerRating.Rating.ToString("N2", CultureInfo.InvariantCulture)
148-
: rating.PlayerRating.Rating.ToString("N2", CultureInfo.InvariantCulture))
146+
@(Request.ComboRating || Request.Arcade ? rating.ComboPlayerRating.Rating.ToString("N2")
147+
: rating.PlayerRating.Rating.ToString("N2"))
149148
</td>
150149
<td>
151150
@if (rating.PlayerRating.PlayerRatingChange != null)
@@ -157,7 +156,7 @@
157156
_ => rating.PlayerRating.PlayerRatingChange.Change30d
158157
};
159158
<span class="@(ratingChange >= 0 ? "bi bi-arrow-top text-success" : "bi bi-arrow-bottom text-danger")">
160-
@ratingChange.ToString("N2", CultureInfo.InvariantCulture)
159+
@ratingChange.ToString("N2")
161160
</span>
162161
}
163162
</td>

‎src/dsstats.razorlib/Players/PlayerCmdrsAvgGainComponent.razor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@using System.Globalization;
21
@using Microsoft.AspNetCore.Components.Forms;
32
@using Microsoft.JSInterop;
43
@using dsstats.shared;
@@ -28,7 +27,7 @@
2827
<div class="me-5">
2928
&Oslash;
3029
<span class="@(avgGain < 0 ? "text-danger" : "text-success")">
31-
@avgGain.ToString("N2", CultureInfo.InvariantCulture)
30+
@avgGain.ToString("N2")
3231
</span>
3332
</div>
3433
</div>
@@ -81,7 +80,7 @@
8180
@HelperService.GetPercentageString(cmdrAvgGain.Wins, cmdrAvgGain.Count)
8281
</td>
8382
<td class="@(cmdrAvgGain.AvgGain < 0 ? "text-danger" : "text-success")">
84-
@cmdrAvgGain.AvgGain.ToString("N2", CultureInfo.InvariantCulture)
83+
@cmdrAvgGain.AvgGain.ToString("N2")
8584
</td>
8685
</tr>
8786
}

‎src/dsstats.razorlib/Players/PlayerDetails.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@using dsstats.shared
22
@using dsstats.shared.Interfaces
33
@using dsstats.razorlib.Services
4-
@using System.Globalization
54
@using Microsoft.JSInterop
65
@inject IPlayerService playerService
76
@inject NavigationManager NavigationManager
@@ -184,7 +183,7 @@
184183
<h4>
185184
<span class="text-warning">Teammates</span> <small class="text-light">
186185
AvgRating
187-
@ratingDetails.AvgTeamRating.ToString("N2", CultureInfo.InvariantCulture)
186+
@ratingDetails.AvgTeamRating.ToString("N2")
188187
</small>
189188
</h4>
190189
</div>

0 commit comments

Comments
 (0)