Skip to content

Commit 23ff6e9

Browse files
committed
Merge branch 'master' into pdfReader_WatermarkDemoModeOnly#5811
2 parents 825c84b + 4abbfe1 commit 23ff6e9

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.0.1</Version>
4+
<Version>9.0.2</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Website: https://www.blazor.zone or https://argozhang.github.io/
44

55
using Microsoft.AspNetCore.Components;
6+
using System.Globalization;
67
using System.Reflection.Metadata;
78

89
namespace BootstrapBlazor.Components;
@@ -97,7 +98,7 @@ protected override void OnInitialized()
9798

9899
Option.PreviewStyle = PreviewStyle.ToDescriptionString();
99100
Option.InitialEditType = InitialEditType.ToDescriptionString();
100-
Option.Language = Language;
101+
Option.Language = Language ?? CultureInfo.CurrentUICulture.Name;
101102
Option.Placeholder = Placeholder;
102103
Option.Height = $"{Height}px";
103104
Option.MinHeight = $"{MinHeight}px";

src/components/BootstrapBlazor.TableExport/BootstrapBlazor.TableExport.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.2.3</Version>
4+
<Version>9.2.4</Version>
55
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
66
</PropertyGroup>
77

@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="BootstrapBlazor" Version="9.5.8" />
15-
<PackageReference Include="MiniExcel" Version="1.40.0" />
15+
<PackageReference Include="MiniExcel" Version="1.41.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)