h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:23:20 +08:00
Code Issues Releases Wiki Activity

Make "general" a common string

Browse Source
This commit is contained in:
Joseph Madamba 2023-09-05 23:00:07 -07:00
parent 701e24e8d3
commit 73604d171a
No known key found for this signature in database
GPG Key ID: 8B746C7BDDF0BD76
12 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Localisation/CommonStrings.cs
View File

@ -169,6 +169,11 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString RevertToDefault => new TranslatableString(getKey(@"revert_to_default"), @"Revert to default");
/// <summary>
/// "General"
/// </summary>
public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
private static string getKey(string key) => $@"{prefix}:{key}";
}
}

5
osu.Game/Localisation/DebugSettingsStrings.cs
View File

@ -14,11 +14,6 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString DebugSectionHeader => new TranslatableString(getKey(@"debug_section_header"), @"Debug");
/// <summary>
/// "General"
/// </summary>
public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
/// <summary>
/// "Show log overlay"
/// </summary>

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

@ -19,11 +19,6 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString BeatmapHeader => new TranslatableString(getKey(@"beatmap_header"), @"Beatmap");
/// <summary>
/// "General"
/// </summary>
public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
/// <summary>
/// "Audio"
/// </summary>

5
osu.Game/Localisation/GeneralSettingsStrings.cs
View File

@ -9,11 +9,6 @@ namespace osu.Game.Localisation
{
private const string prefix = @"osu.Game.Resources.Localisation.GeneralSettings";
/// <summary>
/// "General"
/// </summary>
public static LocalisableString GeneralSectionHeader => new TranslatableString(getKey(@"general_section_header"), @"General");
/// <summary>
/// "Language"
/// </summary>

5
osu.Game/Localisation/SongSelectStrings.cs
View File

@ -19,11 +19,6 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString LocallyModifiedTooltip => new TranslatableString(getKey(@"locally_modified_tooltip"), @"Has been locally modified");
/// <summary>
/// "General"
/// </summary>
public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
/// <summary>
/// "Manage collections"
/// </summary>

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

@ -14,11 +14,6 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString UserInterfaceSectionHeader => new TranslatableString(getKey(@"user_interface_section_header"), @"User Interface");
/// <summary>
/// "General"
/// </summary>
public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
/// <summary>
/// "Rotate cursor when dragging"
/// </summary>

2
osu.Game/Overlays/OSD/CopyUrlToast.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Overlays.OSD
public partial class CopyUrlToast : Toast
{
public CopyUrlToast()
: base(UserInterfaceStrings.GeneralHeader, ToastStrings.UrlCopied, "")
: base(CommonStrings.General, ToastStrings.UrlCopied, "")
{
}
}

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

@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
{
public partial class GeneralSettings : SettingsSubsection
{
protected override LocalisableString Header => DebugSettingsStrings.GeneralHeader;
protected override LocalisableString Header => CommonStrings.General;
[BackgroundDependencyLoader]
private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, IPerformFromScreenRunner? performer)

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

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
{
public partial class GeneralSettings : SettingsSubsection
{
protected override LocalisableString Header => GameplaySettingsStrings.GeneralHeader;
protected override LocalisableString Header => CommonStrings.General;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)

2
osu.Game/Overlays/Settings/Sections/GeneralSection.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
[Resolved(CanBeNull = true)]
private OsuGame? game { get; set; }
public override LocalisableString Header => GeneralSettingsStrings.GeneralSectionHeader;
public override LocalisableString Header => CommonStrings.General;
public override Drawable CreateIcon() => new SpriteIcon
{

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

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
{
public partial class GeneralSettings : SettingsSubsection
{
protected override LocalisableString Header => UserInterfaceStrings.GeneralHeader;
protected override LocalisableString Header => CommonStrings.General;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)

8
osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
View File

@ -18,12 +18,12 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Localisation;
using osu.Game.Overlays;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;
using osu.Game.Localisation;
using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
namespace osu.Game.Screens.Select.FooterV2
{
@ -56,7 +56,7 @@ namespace osu.Game.Screens.Select.FooterV2
beatmapWhenOpening = beatmap.Value;
addHeader(SongSelectStrings.General);
addHeader(CommonStrings.General);
addButton(SongSelectStrings.ManageCollections, FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
addHeader(SongSelectStrings.ForAllDifficulties, beatmapWhenOpening.BeatmapSetInfo.ToString());
@ -70,7 +70,7 @@ namespace osu.Game.Screens.Select.FooterV2
if (songSelect != null && songSelect.AllowEditing)
addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
addButton(WebCommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
}
protected override void LoadComplete()