Skip to content

Commit 45afc5d

Browse files
MarvinKlein1508MarvinKlein1508
authored
Fix formatting for CultureInfo (#607)
1 parent 34265aa commit 45afc5d

File tree

4 files changed

+83
-12
lines changed

4 files changed

+83
-12
lines changed

‎BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInputDocumentation.razor‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
<div class="mb-3">This event fires on every user keystroke that changes the <code>CurrencyInput</code> value.</div>
7979
<Demo Type="typeof(CurrencyInput_Demo_12_Events_Value_Changed)" Tabs="true" />
8080

81+
82+
<SectionHeading Size="HeadingSize.H2" Text="Decimal values" PageUrl="@pageUrl" HashTagName="decimal-values" />
83+
<Demo Type="typeof(CurrencyInput_Demo_13_Decimals)" Tabs="true" />
84+
8185
@code {
8286
private string pageUrl = "/form/currency-input";
8387
private string title = "Blazor CurrencyInput Component";

‎BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_13_Decimals.razor‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<div class="mb-3">
2+
<label class="form-label">Locale: <b>en-IN</b></label>
3+
<CurrencyInput TValue="decimal" @bind-Value="@amount1" Locale="en-IN" Placeholder="Enter amount" />
4+
</div>
5+
<div class="mb-3">Entered Amount: @amount1</div>
6+
7+
<div class="mb-3">
8+
<label class="form-label">Locale: <b>en-US</b></label>
9+
<CurrencyInput TValue="decimal" @bind-Value="@amount2" Locale="en-US" Placeholder="Enter amount" />
10+
</div>
11+
<div class="mb-3">Entered Amount: @amount2</div>
12+
13+
<div class="mb-3">
14+
<label class="form-label">Locale: <b>fr-FR</b></label>
15+
<CurrencyInput TValue="decimal" @bind-Value="@amount3" Locale="fr-FR" Placeholder="Enter amount" />
16+
</div>
17+
<div class="mb-3">Entered Amount: @amount3</div>
18+
19+
<div class="mb-3">
20+
<label class="form-label">Locale: <b>es-ES</b></label>
21+
<CurrencyInput TValue="decimal" @bind-Value="@amount4" Locale="es-ES" Placeholder="Enter amount" />
22+
</div>
23+
<div class="mb-3">Entered Amount: @amount4</div>
24+
25+
<div class="mb-3">
26+
<label class="form-label">Locale: <b>de-DE</b></label>
27+
<CurrencyInput TValue="decimal" @bind-Value="@amount5" Locale="de-DE" Placeholder="Enter amount" />
28+
</div>
29+
<div class="mb-3">Entered Amount: @amount5</div>
30+
31+
<div class="mb-3">
32+
<label class="form-label">Locale: <b>fr-CA</b></label>
33+
<CurrencyInput TValue="decimal" @bind-Value="@amount6" Locale="fr-CA" Placeholder="Enter amount" />
34+
</div>
35+
<div class="mb-3">Entered Amount: @amount6</div>
36+
37+
<div class="mb-3">
38+
<label class="form-label">Locale: <b>en-PH</b></label>
39+
<CurrencyInput TValue="decimal" @bind-Value="@amount7" Locale="en-PH" Placeholder="Enter amount" />
40+
</div>
41+
<div class="mb-3">Entered Amount: @amount7</div>
42+
43+
<div class="mb-3">
44+
<label class="form-label">Locale: <b>en-SE</b></label>
45+
<CurrencyInput TValue="decimal" @bind-Value="@amount8" Locale="en-SE" Placeholder="Enter amount" />
46+
</div>
47+
<div class="mb-3">Entered Amount: @amount8</div>
48+
49+
<div class="mb-3">
50+
<label class="form-label">Locale: <b>zh-CN</b></label>
51+
<CurrencyInput TValue="decimal" @bind-Value="@amount9" Locale="zh-CN" Placeholder="Enter amount" />
52+
</div>
53+
<div class="mb-3">Entered Amount: @amount9</div>
54+
55+
@code {
56+
private decimal amount1 = 12345678.55m;
57+
private decimal amount2 = 12345678.55m;
58+
private decimal amount3 = 12345678.55m;
59+
private decimal amount4 = 12345678.55m;
60+
private decimal amount5 = 12345678.55m;
61+
private decimal amount6 = 12345678.55m;
62+
private decimal amount7 = 12345678.55m;
63+
private decimal amount8 = 12345678.55m;
64+
private decimal amount9 = 12345678.55m;
65+
}

‎blazorbootstrap/Components/Form/CurrencyInput/CurrencyInput.razor.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
2828
{
2929
if (firstRender)
3030
{
31-
await JS.InvokeVoidAsync("window.blazorBootstrap.currencyInput.initialize", ElementId, isFloatingNumber(), AllowNegativeNumbers);
31+
32+
await JS.InvokeVoidAsync("window.blazorBootstrap.currencyInput.initialize", ElementId, isFloatingNumber(), AllowNegativeNumbers, cultureInfo.NumberFormat.CurrencyDecimalSeparator);
3233

3334
var currentValue = Value; // object
3435

@@ -121,7 +122,8 @@ private string ExtractValue(object value, CultureInfo cultureInfo)
121122
if (AllowNegativeNumbers)
122123
validChars = string.Concat(validChars, "-");
123124

124-
return string.Concat(value?.ToString()?.Replace(",", ".")?.Where(c => validChars.Contains(c))!);
125+
var test = string.Concat(value?.ToString()?.Replace(",", ".")?.Where(c => validChars.Contains(c))!);
126+
return test;
125127
}
126128

127129
private bool isFloatingNumber() =>
@@ -332,55 +334,55 @@ private bool TryParseValue(object value, out TValue newValue)
332334
// sbyte? / sbyte
333335
if (typeof(TValue) == typeof(sbyte?) || typeof(TValue) == typeof(sbyte))
334336
{
335-
newValue = (TValue)Convert.ChangeType(value, typeof(sbyte));
337+
newValue = (TValue)Convert.ChangeType(value, typeof(sbyte), CultureInfo.InvariantCulture);
336338

337339
return true;
338340
}
339341
// short? / short
340342

341343
if (typeof(TValue) == typeof(short?) || typeof(TValue) == typeof(short))
342344
{
343-
newValue = (TValue)Convert.ChangeType(value, typeof(short));
345+
newValue = (TValue)Convert.ChangeType(value, typeof(short), CultureInfo.InvariantCulture);
344346

345347
return true;
346348
}
347349
// int? / int
348350

349351
if (typeof(TValue) == typeof(int?) || typeof(TValue) == typeof(int))
350352
{
351-
newValue = (TValue)Convert.ChangeType(value, typeof(int));
353+
newValue = (TValue)Convert.ChangeType(value, typeof(int), CultureInfo.InvariantCulture);
352354

353355
return true;
354356
}
355357
// long? / long
356358

357359
if (typeof(TValue) == typeof(long?) || typeof(TValue) == typeof(long))
358360
{
359-
newValue = (TValue)Convert.ChangeType(value, typeof(long));
361+
newValue = (TValue)Convert.ChangeType(value, typeof(long), CultureInfo.InvariantCulture);
360362

361363
return true;
362364
}
363365
// float? / float
364366

365367
if (typeof(TValue) == typeof(float?) || typeof(TValue) == typeof(float))
366368
{
367-
newValue = (TValue)Convert.ChangeType(value, typeof(float));
369+
newValue = (TValue)Convert.ChangeType(value, typeof(float), CultureInfo.InvariantCulture);
368370

369371
return true;
370372
}
371373
// double? / double
372374

373375
if (typeof(TValue) == typeof(double?) || typeof(TValue) == typeof(double))
374376
{
375-
newValue = (TValue)Convert.ChangeType(value, typeof(double));
377+
newValue = (TValue)Convert.ChangeType(value, typeof(double), CultureInfo.InvariantCulture);
376378

377379
return true;
378380
}
379381
// decimal? / decimal
380382

381383
if (typeof(TValue) == typeof(decimal?) || typeof(TValue) == typeof(decimal))
382384
{
383-
newValue = (TValue)Convert.ChangeType(value, typeof(decimal));
385+
newValue = (TValue)Convert.ChangeType(value, typeof(decimal), CultureInfo.InvariantCulture);
384386

385387
return true;
386388
}

‎blazorbootstrap/wwwroot/blazor.bootstrap.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ window.blazorBootstrap = {
231231
}
232232
},
233233
currencyInput: {
234-
initialize: (elementId, isFloat, allowNegativeNumbers) => {
234+
initialize: (elementId, isFloat, allowNegativeNumbers, decimalSeperator) => {
235235
let currencyEl = document.getElementById(elementId);
236236

237237
currencyEl?.addEventListener('keydown', function (event) {
@@ -251,7 +251,7 @@ window.blazorBootstrap = {
251251
let validChars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
252252

253253
if (isFloat) {
254-
validChars.push('.'); // TODO: check ',' for specific culture
254+
validChars.push(decimalSeperator);
255255
}
256256

257257
if (allowNegativeNumbers) {
@@ -268,7 +268,7 @@ window.blazorBootstrap = {
268268
let validChars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
269269

270270
if (isFloat) {
271-
validChars.push('.'); // TODO: check ',' for specific culture
271+
validChars.push(decimalSeperator);
272272
}
273273

274274
if (allowNegativeNumbers) {

0 commit comments

Comments
 (0)