RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
This commit is contained in:
kj415j45 2021-08-14 21:52:09 +08:00
parent e26ccf786e
commit f87f86e671
No known key found for this signature in database
GPG Key ID: 54226D868052F383
10 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Localisation/GameplaySettingsStrings.cs
View File

@ -42,7 +42,7 @@ public static class GameplaySettingsStrings
/// <summary>
/// "Show difficulty graph on progress bar"
/// </summary>
public static LocalisableString ShowProgressGraph => new TranslatableString(getKey(@"show_progress_graph"), @"Show difficulty graph on progress bar");
public static LocalisableString ShowDifficultyGraph => new TranslatableString(getKey(@"show_progress_graph"), @"Show difficulty graph on progress bar");
/// <summary>
/// "Show health display even when you can't fail"

2
osu.Game/Localisation/OnlineSettingsStrings.cs
View File

@ -32,7 +32,7 @@ public static class OnlineSettingsStrings
/// <summary>
/// "Integrations"
/// </summary>
public static LocalisableString IntegrationHeader => new TranslatableString(getKey(@"integration_header"), @"Integrations");
public static LocalisableString IntegrationsHeader => new TranslatableString(getKey(@"integrations_header"), @"Integrations");
/// <summary>
/// "Discord Rich Presence"

2
osu.Game/Localisation/UserInterfaceStrings.cs
View File

@ -37,7 +37,7 @@ public static class UserInterfaceStrings
/// <summary>
/// "Hold-to-confirm activation time"
/// </summary>
public static LocalisableString HoldActivationDelay => new TranslatableString(getKey(@"hold_activation_delay"), @"Hold-to-confirm activation time");
public static LocalisableString HoldToConfirmActivationTime => new TranslatableString(getKey(@"hold_to_confirm_activation_time"), @"Hold-to-confirm activation time");
/// <summary>
/// "Main Menu"

2
osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
View File

@ -46,7 +46,7 @@ private void load(OsuConfigManager config)
},
new SettingsCheckbox
{
LabelText = GameplaySettingsStrings.ShowProgressGraph,
LabelText = GameplaySettingsStrings.ShowDifficultyGraph,
Current = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
},
new SettingsCheckbox

2
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -146,7 +146,7 @@ protected override void LoadComplete()
{
updateResolutionDropdown();
windowModeDropdown.WarningText = mode.NewValue != WindowMode.Fullscreen ? GraphicsSettingsStrings.NotFullscreenNote : string.Empty;
windowModeDropdown.WarningText = mode.NewValue != WindowMode.Fullscreen ? GraphicsSettingsStrings.NotFullscreenNote : default;
}, true);
windowModes.BindCollectionChanged((sender, args) =>

2
osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
View File

@ -48,7 +48,7 @@ protected override void LoadComplete()
frameLimiterDropdown.Current.BindValueChanged(limit =>
{
frameLimiterDropdown.WarningText = limit.NewValue == FrameSync.Unlimited ? GraphicsSettingsStrings.UnlimitedFramesNote : string.Empty;
frameLimiterDropdown.WarningText = limit.NewValue == FrameSync.Unlimited ? GraphicsSettingsStrings.UnlimitedFramesNote : default;
}, true);
}
}

2
osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Settings.Sections.Online
{
public class IntegrationSettings : SettingsSubsection
{
protected override LocalisableString Header => OnlineSettingsStrings.IntegrationHeader;
protected override LocalisableString Header => OnlineSettingsStrings.IntegrationsHeader;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)

2
osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
View File

@ -37,7 +37,7 @@ private void load(OsuConfigManager config)
},
new SettingsSlider<float, TimeSlider>
{
LabelText = UserInterfaceStrings.HoldActivationDelay,
LabelText = UserInterfaceStrings.HoldToConfirmActivationTime,
Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
KeyboardStep = 50
},

2
osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
View File

@ -61,7 +61,7 @@ protected override void LoadComplete()
user.BindValueChanged(u =>
{
backgroundSourceDropdown.WarningText = u.NewValue?.IsSupporter != true ? UserInterfaceStrings.NotSupporterNote : string.Empty;
backgroundSourceDropdown.WarningText = u.NewValue?.IsSupporter != true ? UserInterfaceStrings.NotSupporterNote : default;
}, true);
}
}

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

@ -24,6 +24,11 @@ public abstract class SettingsSubsection : FillFlowContainer, IHasFilterableChil
protected abstract LocalisableString Header { get; }
public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
// FilterTerms should contains both original string and localised string for user to search.
// Since LocalisableString is unable to get original string at this time (2021-08-14),
// only call .ToString() to use localised one.
// TODO: Update here when FilterTerms accept LocalisableString.
public virtual IEnumerable<string> FilterTerms => new[] { Header.ToString() };
public bool MatchingFilter