sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3108 from peppy/fix-turkish-i

Browse Source 
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
This commit is contained in:
Dan Balasescu
2018-07-26 18:17:38 +09:00
committed by GitHub
parent 8a68ec6462 ceaa23fbbb
commit dc6898e7e0
19 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Mania.Tests/TestCaseNotes.cs
View File

@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Tests
return new ScrollingTestContainer(direction) return new ScrollingTestContainer(direction)
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLower()}") Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLowerInvariant()}")
{ {
Child = new DrawableNote(note) { AccentColour = Color4.OrangeRed } Child = new DrawableNote(note) { AccentColour = Color4.OrangeRed }
} }
@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Mania.Tests
return new ScrollingTestContainer(direction) return new ScrollingTestContainer(direction)
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLower()}") Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLowerInvariant()}")
{ {
Child = new DrawableHoldNote(note) Child = new DrawableHoldNote(note)
{ {

2
osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Beatmaps.Drawables
if (value == status) return; if (value == status) return;
status = value; status = value;
statusText.Text = Enum.GetName(typeof(BeatmapSetOnlineStatus), Status)?.ToUpper(); statusText.Text = Enum.GetName(typeof(BeatmapSetOnlineStatus), Status)?.ToUpperInvariant();
} }
} }

2
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -312,7 +312,7 @@ namespace osu.Game.Beatmaps.Formats
omitFirstBarSignature = effectFlags.HasFlag(EffectFlags.OmitFirstBarLine); omitFirstBarSignature = effectFlags.HasFlag(EffectFlags.OmitFirstBarLine);
} }
string stringSampleSet = sampleSet.ToString().ToLower(); string stringSampleSet = sampleSet.ToString().ToLowerInvariant();
if (stringSampleSet == @"none") if (stringSampleSet == @"none")
stringSampleSet = @"normal"; stringSampleSet = @"normal";

2
osu.Game/Graphics/ScreenshotManager.cs
View File

@ -134,7 +134,7 @@ namespace osu.Game.Graphics
private string getFileName() private string getFileName()
{ {
var dt = DateTime.Now; var dt = DateTime.Now;
var fileExt = screenshotFormat.ToString().ToLower(); var fileExt = screenshotFormat.ToString().ToLowerInvariant();
var withoutIndex = $"osu_{dt:yyyy-MM-dd_HH-mm-ss}.{fileExt}"; var withoutIndex = $"osu_{dt:yyyy-MM-dd_HH-mm-ss}.{fileExt}";
if (!storage.Exists(withoutIndex)) if (!storage.Exists(withoutIndex))

2
osu.Game/Online/API/Requests/GetUserScoresRequest.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Online.API.Requests
} }
// ReSharper disable once ImpureMethodCallOnReadonlyValueField // ReSharper disable once ImpureMethodCallOnReadonlyValueField
protected override string Target => $@"users/{userId}/scores/{type.ToString().ToLower()}?offset={offset}"; protected override string Target => $@"users/{userId}/scores/{type.ToString().ToLowerInvariant()}?offset={offset}";
} }
public enum ScoreType public enum ScoreType

2
osu.Game/Online/API/Requests/PostMessageRequest.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Online.API.Requests
req.Method = HttpMethod.POST; req.Method = HttpMethod.POST;
req.AddParameter(@"target_type", message.TargetType.GetDescription()); req.AddParameter(@"target_type", message.TargetType.GetDescription());
req.AddParameter(@"target_id", message.TargetId.ToString()); req.AddParameter(@"target_id", message.TargetId.ToString());
req.AddParameter(@"is_action", message.IsAction.ToString().ToLower()); req.AddParameter(@"is_action", message.IsAction.ToString().ToLowerInvariant());
req.AddParameter(@"message", message.Content); req.AddParameter(@"message", message.Content);
return req; return req;

2
osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Online.API.Requests
} }
// ReSharper disable once ImpureMethodCallOnReadonlyValueField // ReSharper disable once ImpureMethodCallOnReadonlyValueField
protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={(int)searchCategory}&sort={sortCriteria.ToString().ToLower()}_{directionString}"; protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={(int)searchCategory}&sort={sortCriteria.ToString().ToLowerInvariant()}_{directionString}";
} }
public enum BeatmapSearchCategory public enum BeatmapSearchCategory

2
osu.Game/Overlays/Chat/ChannelSection.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Chat
public string Header public string Header
{ {
get { return header.Text; } get { return header.Text; }
set { header.Text = value.ToUpper(); } set { header.Text = value.ToUpperInvariant(); }
} }
public IEnumerable<Channel> Channels public IEnumerable<Channel> Channels

2
osu.Game/Overlays/MedalSplash/DrawableMedal.cs
View File

@ -62,7 +62,7 @@ namespace osu.Game.Overlays.MedalSplash
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = "Medal Unlocked".ToUpper(), Text = "Medal Unlocked".ToUpperInvariant(),
TextSize = 24, TextSize = 24,
Font = @"Exo2.0-Light", Font = @"Exo2.0-Light",
Alpha = 0f, Alpha = 0f,

6
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Notifications
set set
{ {
title = value; title = value;
if (titleText != null) titleText.Text = title.ToUpper(); if (titleText != null) titleText.Text = title.ToUpperInvariant();
} }
} }
@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Notifications
{ {
titleText = new OsuSpriteText titleText = new OsuSpriteText
{ {
Text = title.ToUpper(), Text = title.ToUpperInvariant(),
Font = @"Exo2.0-Black", Font = @"Exo2.0-Black",
}, },
countText = new OsuSpriteText countText = new OsuSpriteText
@ -154,7 +154,7 @@ namespace osu.Game.Overlays.Notifications
public string Text public string Text
{ {
get { return text.Text; } get { return text.Text; }
set { text.Text = value.ToUpper(); } set { text.Text = value.ToUpperInvariant(); }
} }
} }

4
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -176,9 +176,9 @@ namespace osu.Game.Overlays
{ {
Schedule(() => Schedule(() =>
{ {
textLine1.Text = description.Name.ToUpper(); textLine1.Text = description.Name.ToUpperInvariant();
textLine2.Text = description.Value; textLine2.Text = description.Value;
textLine3.Text = description.Shortcut.ToUpper(); textLine3.Text = description.Shortcut.ToUpperInvariant();
if (string.IsNullOrEmpty(textLine3.Text)) if (string.IsNullOrEmpty(textLine3.Text))
textLine3.Text = "NO KEY BOUND"; textLine3.Text = "NO KEY BOUND";

2
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Settings
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = Header.ToUpper(), Text = Header.ToUpperInvariant(),
Margin = new MarginPadding { Bottom = 10, Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS }, Margin = new MarginPadding { Bottom = 10, Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS },
Font = @"Exo2.0-Black", Font = @"Exo2.0-Black",
}, },

2
osu.Game/Rulesets/Judgements/DrawableJudgement.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Judgements
Child = new SkinnableDrawable($"Play/{Judgement.Result}", _ => JudgementText = new OsuSpriteText Child = new SkinnableDrawable($"Play/{Judgement.Result}", _ => JudgementText = new OsuSpriteText
{ {
Text = Judgement.Result.GetDescription().ToUpper(), Text = Judgement.Result.GetDescription().ToUpperInvariant(),
Font = @"Venera", Font = @"Venera",
Colour = judgementColour(Judgement.Result), Colour = judgementColour(Judgement.Result),
Scale = new Vector2(0.85f, 1), Scale = new Vector2(0.85f, 1),

4
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -197,10 +197,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
var bank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[0]); var bank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[0]);
var addbank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[1]); var addbank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[1]);
string stringBank = bank.ToString().ToLower(); string stringBank = bank.ToString().ToLowerInvariant();
if (stringBank == @"none") if (stringBank == @"none")
stringBank = null; stringBank = null;
string stringAddBank = addbank.ToString().ToLower(); string stringAddBank = addbank.ToString().ToLowerInvariant();
if (stringAddBank == @"none") if (stringAddBank == @"none")
stringAddBank = null; stringAddBank = null;

2
osu.Game/Screens/Multi/Header.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Screens.Multi
}, },
}; };
breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type.ToLower(); breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type.ToLowerInvariant();
breadcrumbs.Current.TriggerChange(); breadcrumbs.Current.TriggerChange();
} }

2
osu.Game/Screens/Play/Break/BreakInfo.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play.Break
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = "current progress".ToUpper(), Text = "current progress".ToUpperInvariant(),
TextSize = 15, TextSize = 15,
Font = "Exo2.0-Black", Font = "Exo2.0-Black",
}, },

2
osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
View File

@ -94,7 +94,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
{ {
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Text = Title.ToUpper(), Text = Title.ToUpperInvariant(),
TextSize = 17, TextSize = 17,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Margin = new MarginPadding { Left = 10 }, Margin = new MarginPadding { Left = 10 },

2
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -323,7 +323,7 @@ namespace osu.Game.Screens.Tournament
if (string.IsNullOrEmpty(line)) if (string.IsNullOrEmpty(line))
continue; continue;
if (line.ToUpper().StartsWith("GROUP")) if (line.ToUpperInvariant().StartsWith("GROUP"))
continue; continue;
// ReSharper disable once AccessToModifiedClosure // ReSharper disable once AccessToModifiedClosure

4
osu.Game/Screens/Tournament/Group.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Screens.Tournament
Position = new Vector2(0, 7f), Position = new Vector2(0, 7f),
Text = $"GROUP {name.ToUpper()}", Text = $"GROUP {name.ToUpperInvariant()}",
TextSize = 8f, TextSize = 8f,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Colour = new Color4(255, 204, 34, 255), Colour = new Color4(255, 204, 34, 255),
@ -161,7 +161,7 @@ namespace osu.Game.Screens.Tournament
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = team.Acronym.ToUpper(), Text = team.Acronym.ToUpperInvariant(),
TextSize = 10f, TextSize = 10f,
Font = @"Exo2.0-Bold" Font = @"Exo2.0-Bold"
} }