Skip to content

Commit 86862b1

Browse files
authored
Merge pull request #21164 from Susko3/fix-default-24h-time-format
Fix `Prefer24HourTime` default value being wrong
2 parents 50cc282 + efc0325 commit 86862b1

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

osu.Android.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</ItemGroup>
5353
<ItemGroup>
5454
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.1103.0" />
55-
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.1101.0" />
55+
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.1110.0" />
5656
</ItemGroup>
5757
<ItemGroup Label="Transitive Dependencies">
5858
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

osu.Game/Configuration/OsuConfigManager.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using System;
77
using System.Diagnostics;
8-
using System.Globalization;
98
using osu.Framework.Configuration;
109
using osu.Framework.Configuration.Tracking;
1110
using osu.Framework.Extensions;
@@ -115,7 +114,7 @@ protected override void InitialiseDefaults()
115114
SetDefault(OsuSetting.MenuParallax, true);
116115

117116
// See https://stackoverflow.com/a/63307411 for default sourcing.
118-
SetDefault(OsuSetting.Prefer24HourTime, CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains(@"tt"));
117+
SetDefault(OsuSetting.Prefer24HourTime, !CultureInfoHelper.SystemCulture.DateTimeFormat.ShortTimePattern.Contains(@"tt"));
119118

120119
// Gameplay
121120
SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);

osu.Game/osu.Game.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
3737
<PackageReference Include="Realm" Version="10.18.0" />
38-
<PackageReference Include="ppy.osu.Framework" Version="2022.1101.0" />
38+
<PackageReference Include="ppy.osu.Framework" Version="2022.1110.0" />
3939
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.1103.0" />
4040
<PackageReference Include="Sentry" Version="3.23.1" />
4141
<PackageReference Include="SharpCompress" Version="0.32.2" />

osu.iOS.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</ItemGroup>
6363
<ItemGroup Label="Package References">
6464
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.1103.0" />
65-
<PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1101.0" />
65+
<PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1110.0" />
6666
</ItemGroup>
6767
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
6868
<PropertyGroup>
@@ -82,7 +82,7 @@
8282
<PackageReference Include="DiffPlex" Version="1.7.1" />
8383
<PackageReference Include="Humanizer" Version="2.14.1" />
8484
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
85-
<PackageReference Include="ppy.osu.Framework" Version="2022.1101.0" />
85+
<PackageReference Include="ppy.osu.Framework" Version="2022.1110.0" />
8686
<PackageReference Include="SharpCompress" Version="0.32.2" />
8787
<PackageReference Include="NUnit" Version="3.13.3" />
8888
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

0 commit comments

Comments
 (0)