h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 22:43:05 +08:00
Code Issues Releases Wiki Activity

Merge pull request #13921 from Game4all/localise-profile-overlay

Browse Source 
Localise user profile overlay
This commit is contained in:
Dean Herbert 2021-07-20 00:37:01 +09:00 committed by GitHub
commit e77597c2b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 140 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.Overlays.Profile.Header.Components; using osu.Game.Overlays.Profile.Header.Components;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
@ -119,12 +120,12 @@ namespace osu.Game.Overlays.Profile.Header
{ {
hiddenDetailGlobal = new OverlinedInfoContainer hiddenDetailGlobal = new OverlinedInfoContainer
{ {
Title = "Global Ranking", Title = UsersStrings.ShowRankGlobalSimple,
LineColour = colourProvider.Highlight1 LineColour = colourProvider.Highlight1
}, },
hiddenDetailCountry = new OverlinedInfoContainer hiddenDetailCountry = new OverlinedInfoContainer
{ {
Title = "Country Ranking", Title = UsersStrings.ShowRankCountrySimple,
LineColour = colourProvider.Highlight1 LineColour = colourProvider.Highlight1
}, },
} }

3
osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Resources.Localisation.Web;
using osuTK; using osuTK;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public readonly BindableBool DetailsVisible = new BindableBool(); public readonly BindableBool DetailsVisible = new BindableBool();
public override LocalisableString TooltipText => DetailsVisible.Value ? "collapse" : "expand"; public override LocalisableString TooltipText => DetailsVisible.Value ? CommonStrings.ButtonsCollapse : CommonStrings.ButtonsExpand;
private SpriteIcon icon; private SpriteIcon icon;
private Sample sampleOpen; private Sample sampleOpen;

3
osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
@ -13,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public readonly Bindable<User> User = new Bindable<User>(); public readonly Bindable<User> User = new Bindable<User>();
public override LocalisableString TooltipText => "followers"; public override LocalisableString TooltipText => FriendsStrings.ButtonsDisabled;
protected override IconUsage Icon => FontAwesome.Solid.User; protected override IconUsage Icon => FontAwesome.Solid.User;

6
osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
@ -19,13 +20,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public readonly Bindable<User> User = new Bindable<User>(); public readonly Bindable<User> User = new Bindable<User>();
public LocalisableString TooltipText { get; } public LocalisableString TooltipText { get; private set; }
private OsuSpriteText levelText; private OsuSpriteText levelText;
public LevelBadge() public LevelBadge()
{ {
TooltipText = "level"; TooltipText = UsersStrings.ShowStatsLevel("0");
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -53,6 +54,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
private void updateLevel(User user) private void updateLevel(User user)
{ {
levelText.Text = user?.Statistics?.Level.Current.ToString() ?? "0"; levelText.Text = user?.Statistics?.Level.Current.ToString() ?? "0";
TooltipText = UsersStrings.ShowStatsLevel(user?.Statistics?.Level.Current.ToString());
} }
} }
} }

3
osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using osuTK.Graphics; using osuTK.Graphics;
@ -26,7 +27,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
public LevelProgressBar() public LevelProgressBar()
{ {
TooltipText = "progress to next level"; TooltipText = UsersStrings.ShowStatsLevelProgress;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

3
osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
@ -13,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public readonly Bindable<User> User = new Bindable<User>(); public readonly Bindable<User> User = new Bindable<User>();
public override LocalisableString TooltipText => "mapping subscribers"; public override LocalisableString TooltipText => FollowsStrings.MappingFollowers;
protected override IconUsage Icon => FontAwesome.Solid.Bell; protected override IconUsage Icon => FontAwesome.Solid.Bell;

3
osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
@ -17,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public readonly Bindable<User> User = new Bindable<User>(); public readonly Bindable<User> User = new Bindable<User>();
public override LocalisableString TooltipText => "send message"; public override LocalisableString TooltipText => UsersStrings.CardSendMessage;
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private ChannelManager channelManager { get; set; } private ChannelManager channelManager { get; set; }

3
osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
View File

@ -4,6 +4,7 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osuTK.Graphics; using osuTK.Graphics;
@ -16,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
private readonly OsuSpriteText title; private readonly OsuSpriteText title;
private readonly OsuSpriteText content; private readonly OsuSpriteText content;
public string Title public LocalisableString Title
{ {
set => title.Text = value; set => title.Text = value;
} }

3
osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
@ -31,7 +32,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
InternalChild = info = new OverlinedInfoContainer InternalChild = info = new OverlinedInfoContainer
{ {
Title = "Total Play Time", Title = UsersStrings.ShowStatsPlayTime,
LineColour = colourProvider.Highlight1, LineColour = colourProvider.Highlight1,
}; };

3
osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
@ -68,7 +69,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Text = @"formerly known as", Text = UsersStrings.ShowPreviousUsernames,
Font = OsuFont.GetFont(size: 10, italics: true) Font = OsuFont.GetFont(size: 10, italics: true)
} }
}, },

5
osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
@ -27,7 +28,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = "No recent plays", Text = UsersStrings.ShowExtraUnranked,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular) Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular)
}); });
} }
@ -74,7 +75,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
private class RankGraphTooltip : UserGraphTooltip private class RankGraphTooltip : UserGraphTooltip
{ {
public RankGraphTooltip() public RankGraphTooltip()
: base("Global Ranking") : base(UsersStrings.ShowRankGlobalSimple)
{ {
} }

3
osu.Game/Overlays/Profile/Header/Components/SupporterIcon.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
{ {
@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
private readonly FillFlowContainer iconContainer; private readonly FillFlowContainer iconContainer;
private readonly CircularContainer content; private readonly CircularContainer content;
public LocalisableString TooltipText => "osu!supporter"; public LocalisableString TooltipText => UsersStrings.ShowIsSupporter;
public int SupportLevel public int SupportLevel
{ {

7
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.Leaderboards; using osu.Game.Online.Leaderboards;
using osu.Game.Overlays.Profile.Header.Components; using osu.Game.Overlays.Profile.Header.Components;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
@ -100,7 +101,7 @@ namespace osu.Game.Overlays.Profile.Header
}, },
medalInfo = new OverlinedInfoContainer medalInfo = new OverlinedInfoContainer
{ {
Title = "Medals", Title = UsersStrings.ShowStatsMedals,
LineColour = colours.GreenLight, LineColour = colours.GreenLight,
}, },
ppInfo = new OverlinedInfoContainer ppInfo = new OverlinedInfoContainer
@ -151,12 +152,12 @@ namespace osu.Game.Overlays.Profile.Header
{ {
detailGlobalRank = new OverlinedInfoContainer(true, 110) detailGlobalRank = new OverlinedInfoContainer(true, 110)
{ {
Title = "Global Ranking", Title = UsersStrings.ShowRankGlobalSimple,
LineColour = colourProvider.Highlight1, LineColour = colourProvider.Highlight1,
}, },
detailCountryRank = new OverlinedInfoContainer(false, 110) detailCountryRank = new OverlinedInfoContainer(false, 110)
{ {
Title = "Country Ranking", Title = UsersStrings.ShowRankCountrySimple,
LineColour = colourProvider.Highlight1, LineColour = colourProvider.Highlight1,
}, },
} }

18
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -7,11 +7,13 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Overlays.Profile.Header.Components; using osu.Game.Overlays.Profile.Header.Components;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using osu.Game.Users.Drawables; using osu.Game.Users.Drawables;
using osuTK; using osuTK;
@ -179,19 +181,19 @@ namespace osu.Game.Overlays.Profile.Header
if (user?.Statistics != null) if (user?.Statistics != null)
{ {
userStats.Add(new UserStatsLine("Ranked Score", user.Statistics.RankedScore.ToString("#,##0"))); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsRankedScore, user.Statistics.RankedScore.ToString("#,##0")));
userStats.Add(new UserStatsLine("Hit Accuracy", user.Statistics.DisplayAccuracy)); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsHitAccuracy, user.Statistics.DisplayAccuracy));
userStats.Add(new UserStatsLine("Play Count", user.Statistics.PlayCount.ToString("#,##0"))); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsPlayCount, user.Statistics.PlayCount.ToString("#,##0")));
userStats.Add(new UserStatsLine("Total Score", user.Statistics.TotalScore.ToString("#,##0"))); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsTotalScore, user.Statistics.TotalScore.ToString("#,##0")));
userStats.Add(new UserStatsLine("Total Hits", user.Statistics.TotalHits.ToString("#,##0"))); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsTotalHits, user.Statistics.TotalHits.ToString("#,##0")));
userStats.Add(new UserStatsLine("Maximum Combo", user.Statistics.MaxCombo.ToString("#,##0"))); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsMaximumCombo, user.Statistics.MaxCombo.ToString("#,##0")));
userStats.Add(new UserStatsLine("Replays Watched by Others", user.Statistics.ReplaysWatched.ToString("#,##0"))); userStats.Add(new UserStatsLine(UsersStrings.ShowStatsReplaysWatchedByOthers, user.Statistics.ReplaysWatched.ToString("#,##0")));
} }
} }
private class UserStatsLine : Container private class UserStatsLine : Container
{ {
public UserStatsLine(string left, string right) public UserStatsLine(LocalisableString left, string right)
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;

10
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -7,12 +7,14 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Overlays.Profile.Header; using osu.Game.Overlays.Profile.Header;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile namespace osu.Game.Overlays.Profile
{ {
public class ProfileHeader : TabControlOverlayHeader<string> public class ProfileHeader : TabControlOverlayHeader<LocalisableString>
{ {
private UserCoverBackground coverContainer; private UserCoverBackground coverContainer;
@ -27,8 +29,8 @@ namespace osu.Game.Overlays.Profile
User.ValueChanged += e => updateDisplay(e.NewValue); User.ValueChanged += e => updateDisplay(e.NewValue);
TabControl.AddItem("info"); TabControl.AddItem(LayoutStrings.HeaderUsersShow);
TabControl.AddItem("modding"); TabControl.AddItem(LayoutStrings.HeaderUsersModding);
centreHeaderContainer.DetailsVisible.BindValueChanged(visible => detailHeaderContainer.Expanded = visible.NewValue, true); centreHeaderContainer.DetailsVisible.BindValueChanged(visible => detailHeaderContainer.Expanded = visible.NewValue, true);
} }
@ -96,7 +98,7 @@ namespace osu.Game.Overlays.Profile
{ {
public ProfileHeaderTitle() public ProfileHeaderTitle()
{ {
Title = "player info"; Title = PageTitleStrings.MainUsersControllerDefault;
IconTexture = "Icons/Hexacons/profile"; IconTexture = "Icons/Hexacons/profile";
} }
} }

3
osu.Game/Overlays/Profile/ProfileSection.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
@ -17,7 +18,7 @@ namespace osu.Game.Overlays.Profile
{ {
public abstract class ProfileSection : Container public abstract class ProfileSection : Container
{ {
public abstract string Title { get; } public abstract LocalisableString Title { get; }
public abstract string Identifier { get; } public abstract string Identifier { get; }

7
osu.Game/Overlays/Profile/Sections/AboutSection.cs
View File

@ -1,12 +1,15 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class AboutSection : ProfileSection public class AboutSection : ProfileSection
{ {
public override string Title => "me!"; public override LocalisableString Title => UsersStrings.ShowExtraMeTitle;
public override string Identifier => "me"; public override string Identifier => @"me";
} }
} }

3
osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Localisation;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
private const float panel_padding = 10f; private const float panel_padding = 10f;
private readonly BeatmapSetType type; private readonly BeatmapSetType type;
public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string headerText) public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, LocalisableString headerText)
: base(user, headerText) : base(user, headerText)
{ {
this.type = type; this.type = type;

16
osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
View File

@ -1,26 +1,28 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Overlays.Profile.Sections.Beatmaps; using osu.Game.Overlays.Profile.Sections.Beatmaps;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class BeatmapsSection : ProfileSection public class BeatmapsSection : ProfileSection
{ {
public override string Title => "Beatmaps"; public override LocalisableString Title => UsersStrings.ShowExtraBeatmapsTitle;
public override string Identifier => "beatmaps"; public override string Identifier => @"beatmaps";
public BeatmapsSection() public BeatmapsSection()
{ {
Children = new[] Children = new[]
{ {
new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, "Favourite Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, UsersStrings.ShowExtraBeatmapsFavouriteTitle),
new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User, "Ranked & Approved Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User, UsersStrings.ShowExtraBeatmapsRankedTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, "Loved Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, UsersStrings.ShowExtraBeatmapsLovedTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User, "Pending Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User, UsersStrings.ShowExtraBeatmapsPendingTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, "Graveyarded Beatmaps") new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, UsersStrings.ShowExtraBeatmapsGraveyardTitle)
}; };
} }
} }

5
osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation;
using osu.Game.Users; using osu.Game.Users;
using static osu.Game.Users.User; using static osu.Game.Users.User;
@ -18,9 +19,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
/// <summary> /// <summary>
/// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the history graph tooltip. /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the history graph tooltip.
/// </summary> /// </summary>
protected abstract string GraphCounterName { get; } protected abstract LocalisableString GraphCounterName { get; }
protected ChartProfileSubsection(Bindable<User> user, string headerText) protected ChartProfileSubsection(Bindable<User> user, LocalisableString headerText)
: base(user, headerText) : base(user, headerText)
{ {
} }

3
osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
View File

@ -13,6 +13,7 @@ using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections.Historical namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
@ -143,7 +144,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
private class PlayCountText : CompositeDrawable, IHasTooltip private class PlayCountText : CompositeDrawable, IHasTooltip
{ {
public LocalisableString TooltipText => "times played"; public LocalisableString TooltipText => UsersStrings.ShowExtraHistoricalMostPlayedCount;
public PlayCountText(int playCount) public PlayCountText(int playCount)
{ {

3
osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Sections.Historical namespace osu.Game.Overlays.Profile.Sections.Historical
@ -16,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
public class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap> public class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap>
{ {
public PaginatedMostPlayedBeatmapContainer(Bindable<User> user) public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
: base(user, "Most Played Beatmaps") : base(user, UsersStrings.ShowExtraHistoricalMostPlayedTitle)
{ {
ItemsPerPage = 5; ItemsPerPage = 5;
} }

6
osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
View File

@ -2,6 +2,8 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using static osu.Game.Users.User; using static osu.Game.Users.User;
@ -9,10 +11,10 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
public class PlayHistorySubsection : ChartProfileSubsection public class PlayHistorySubsection : ChartProfileSubsection
{ {
protected override string GraphCounterName => "Plays"; protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalMonthlyPlaycountsCountLabel;
public PlayHistorySubsection(Bindable<User> user) public PlayHistorySubsection(Bindable<User> user)
: base(user, "Play History") : base(user, UsersStrings.ShowExtraHistoricalMonthlyPlaycountsTitle)
{ {
} }

3
osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Allocation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osuTK; using osuTK;
using osu.Framework.Localisation;
using static osu.Game.Users.User; using static osu.Game.Users.User;
namespace osu.Game.Overlays.Profile.Sections.Historical namespace osu.Game.Overlays.Profile.Sections.Historical
@ -42,7 +43,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
private readonly Container<TickLine> rowLinesContainer; private readonly Container<TickLine> rowLinesContainer;
private readonly Container<TickLine> columnLinesContainer; private readonly Container<TickLine> columnLinesContainer;
public ProfileLineChart(string graphCounterName) public ProfileLineChart(LocalisableString graphCounterName)
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = 250; Height = 250;

6
osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
View File

@ -2,6 +2,8 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Users; using osu.Game.Users;
using static osu.Game.Users.User; using static osu.Game.Users.User;
@ -9,10 +11,10 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
public class ReplaysSubsection : ChartProfileSubsection public class ReplaysSubsection : ChartProfileSubsection
{ {
protected override string GraphCounterName => "Replays Watched"; protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalReplaysWatchedCountsCountLabel;
public ReplaysSubsection(Bindable<User> user) public ReplaysSubsection(Bindable<User> user)
: base(user, "Replays Watched History") : base(user, UsersStrings.ShowExtraHistoricalReplaysWatchedCountsTitle)
{ {
} }

11
osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
View File

@ -5,13 +5,14 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Localisation;
using static osu.Game.Users.User; using static osu.Game.Users.User;
namespace osu.Game.Overlays.Profile.Sections.Historical namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
public class UserHistoryGraph : UserGraph<DateTime, long> public class UserHistoryGraph : UserGraph<DateTime, long>
{ {
private readonly string tooltipCounterName; private readonly LocalisableString tooltipCounterName;
[CanBeNull] [CanBeNull]
public UserHistoryCount[] Values public UserHistoryCount[] Values
@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray(); set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
} }
public UserHistoryGraph(string tooltipCounterName) public UserHistoryGraph(LocalisableString tooltipCounterName)
{ {
this.tooltipCounterName = tooltipCounterName; this.tooltipCounterName = tooltipCounterName;
} }
@ -40,9 +41,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
protected class HistoryGraphTooltip : UserGraphTooltip protected class HistoryGraphTooltip : UserGraphTooltip
{ {
private readonly string tooltipCounterName; private readonly LocalisableString tooltipCounterName;
public HistoryGraphTooltip(string tooltipCounterName) public HistoryGraphTooltip(LocalisableString tooltipCounterName)
: base(tooltipCounterName) : base(tooltipCounterName)
{ {
this.tooltipCounterName = tooltipCounterName; this.tooltipCounterName = tooltipCounterName;
@ -61,7 +62,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
private class TooltipDisplayContent private class TooltipDisplayContent
{ {
public string Name; public LocalisableString Name;
public string Count; public string Count;
public string Date; public string Date;
} }

8
osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
View File

@ -2,17 +2,19 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Localisation;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Overlays.Profile.Sections.Historical; using osu.Game.Overlays.Profile.Sections.Historical;
using osu.Game.Overlays.Profile.Sections.Ranks; using osu.Game.Overlays.Profile.Sections.Ranks;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class HistoricalSection : ProfileSection public class HistoricalSection : ProfileSection
{ {
public override string Title => "Historical"; public override LocalisableString Title => UsersStrings.ShowExtraHistoricalTitle;
public override string Identifier => "historical"; public override string Identifier => @"historical";
public HistoricalSection() public HistoricalSection()
{ {
@ -20,7 +22,7 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
new PlayHistorySubsection(User), new PlayHistorySubsection(User),
new PaginatedMostPlayedBeatmapContainer(User), new PaginatedMostPlayedBeatmapContainer(User),
new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)"), new PaginatedScoreContainer(ScoreType.Recent, User, UsersStrings.ShowExtraHistoricalRecentPlaysTitle),
new ReplaysSubsection(User) new ReplaysSubsection(User)
}; };
} }

6
osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
View File

@ -12,6 +12,8 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Users; using osu.Game.Users;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Resources.Localisation.Web;
using osu.Framework.Localisation;
namespace osu.Game.Overlays.Profile.Sections.Kudosu namespace osu.Game.Overlays.Profile.Sections.Kudosu
{ {
@ -37,7 +39,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
private class CountTotal : CountSection private class CountTotal : CountSection
{ {
public CountTotal() public CountTotal()
: base("Total Kudosu Earned") : base(UsersStrings.ShowExtraKudosuTotal)
{ {
DescriptionText.AddText("Based on how much of a contribution the user has made to beatmap moderation. See "); DescriptionText.AddText("Based on how much of a contribution the user has made to beatmap moderation. See ");
DescriptionText.AddLink("this page", "https://osu.ppy.sh/wiki/Kudosu"); DescriptionText.AddLink("this page", "https://osu.ppy.sh/wiki/Kudosu");
@ -56,7 +58,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
set => valueText.Text = value.ToString("N0"); set => valueText.Text = value.ToString("N0");
} }
public CountSection(string header) public CountSection(LocalisableString header)
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;

3
osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
View File

@ -8,13 +8,14 @@ using osu.Framework.Bindables;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.API; using osu.Game.Online.API;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections.Kudosu namespace osu.Game.Overlays.Profile.Sections.Kudosu
{ {
public class PaginatedKudosuHistoryContainer : PaginatedProfileSubsection<APIKudosuHistory> public class PaginatedKudosuHistoryContainer : PaginatedProfileSubsection<APIKudosuHistory>
{ {
public PaginatedKudosuHistoryContainer(Bindable<User> user) public PaginatedKudosuHistoryContainer(Bindable<User> user)
: base(user, missingText: "This user hasn't received any kudosu!") : base(user, missingText: UsersStrings.ShowExtraKudosuEntryEmpty)
{ {
ItemsPerPage = 5; ItemsPerPage = 5;
} }

6
osu.Game/Overlays/Profile/Sections/KudosuSection.cs
View File

@ -3,14 +3,16 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Overlays.Profile.Sections.Kudosu; using osu.Game.Overlays.Profile.Sections.Kudosu;
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class KudosuSection : ProfileSection public class KudosuSection : ProfileSection
{ {
public override string Title => "Kudosu!"; public override LocalisableString Title => UsersStrings.ShowExtraKudosuTitle;
public override string Identifier => "kudosu"; public override string Identifier => @"kudosu";
public KudosuSection() public KudosuSection()
{ {

7
osu.Game/Overlays/Profile/Sections/MedalsSection.cs
View File

@ -1,12 +1,15 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class MedalsSection : ProfileSection public class MedalsSection : ProfileSection
{ {
public override string Title => "Medals"; public override LocalisableString Title => UsersStrings.ShowExtraMedalsTitle;
public override string Identifier => "medals"; public override string Identifier => @"medals";
} }
} }

9
osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Localisation;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
@ -36,9 +37,9 @@ namespace osu.Game.Overlays.Profile.Sections
private ShowMoreButton moreButton; private ShowMoreButton moreButton;
private OsuSpriteText missing; private OsuSpriteText missing;
private readonly string missingText; private readonly LocalisableString? missingText;
protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "") protected PaginatedProfileSubsection(Bindable<User> user, LocalisableString? headerText = null, LocalisableString? missingText = null)
: base(user, headerText, CounterVisibilityState.AlwaysVisible) : base(user, headerText, CounterVisibilityState.AlwaysVisible)
{ {
this.missingText = missingText; this.missingText = missingText;
@ -68,7 +69,7 @@ namespace osu.Game.Overlays.Profile.Sections
missing = new OsuSpriteText missing = new OsuSpriteText
{ {
Font = OsuFont.GetFont(size: 15), Font = OsuFont.GetFont(size: 15),
Text = missingText, Text = missingText ?? string.Empty,
Alpha = 0, Alpha = 0,
} }
} }
@ -114,7 +115,7 @@ namespace osu.Game.Overlays.Profile.Sections
moreButton.Hide(); moreButton.Hide();
moreButton.IsLoading = false; moreButton.IsLoading = false;
if (!string.IsNullOrEmpty(missingText)) if (missingText.HasValue)
missing.Show(); missing.Show();
return; return;

9
osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Users; using osu.Game.Users;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Localisation;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
@ -14,14 +15,14 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
protected readonly Bindable<User> User = new Bindable<User>(); protected readonly Bindable<User> User = new Bindable<User>();
private readonly string headerText; private readonly LocalisableString headerText;
private readonly CounterVisibilityState counterVisibilityState; private readonly CounterVisibilityState counterVisibilityState;
private ProfileSubsectionHeader header; private ProfileSubsectionHeader header;
protected ProfileSubsection(Bindable<User> user, string headerText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden) protected ProfileSubsection(Bindable<User> user, LocalisableString? headerText = null, CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
{ {
this.headerText = headerText; this.headerText = headerText ?? string.Empty;
this.counterVisibilityState = counterVisibilityState; this.counterVisibilityState = counterVisibilityState;
User.BindTo(user); User.BindTo(user);
} }
@ -37,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
header = new ProfileSubsectionHeader(headerText, counterVisibilityState) header = new ProfileSubsectionHeader(headerText, counterVisibilityState)
{ {
Alpha = string.IsNullOrEmpty(headerText) ? 0 : 1 Alpha = string.IsNullOrEmpty(headerText.ToString()) ? 0 : 1
}, },
CreateContent() CreateContent()
}; };

5
osu.Game/Overlays/Profile/Sections/ProfileSubsectionHeader.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
using osuTK; using osuTK;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Localisation;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
@ -24,12 +25,12 @@ namespace osu.Game.Overlays.Profile.Sections
set => current.Current = value; set => current.Current = value;
} }
private readonly string text; private readonly LocalisableString text;
private readonly CounterVisibilityState counterState; private readonly CounterVisibilityState counterState;
private CounterPill counterPill; private CounterPill counterPill;
public ProfileSubsectionHeader(string text, CounterVisibilityState counterState) public ProfileSubsectionHeader(LocalisableString text, CounterVisibilityState counterState)
{ {
this.text = text; this.text = text;
this.counterState = counterState; this.counterState = counterState;

3
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Scoring; using osu.Game.Scoring;
using osuTK; using osuTK;
@ -51,7 +52,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
new OsuSpriteText new OsuSpriteText
{ {
Font = OsuFont.GetFont(size: 12), Font = OsuFont.GetFont(size: 12),
Text = $@"weighted {weight:0%}" Text = UsersStrings.ShowExtraTopRanksPpWeight(weight.ToString("0%"))
} }
} }
}; };

3
osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Online.API.Requests.Responses;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Localisation;
namespace osu.Game.Overlays.Profile.Sections.Ranks namespace osu.Game.Overlays.Profile.Sections.Ranks
{ {
@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{ {
private readonly ScoreType type; private readonly ScoreType type;
public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText) public PaginatedScoreContainer(ScoreType type, Bindable<User> user, LocalisableString headerText)
: base(user, headerText) : base(user, headerText)
{ {
this.type = type; this.type = type;

10
osu.Game/Overlays/Profile/Sections/RanksSection.cs
View File

@ -3,21 +3,23 @@
using osu.Game.Overlays.Profile.Sections.Ranks; using osu.Game.Overlays.Profile.Sections.Ranks;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class RanksSection : ProfileSection public class RanksSection : ProfileSection
{ {
public override string Title => "Ranks"; public override LocalisableString Title => UsersStrings.ShowExtraTopRanksTitle;
public override string Identifier => "top_ranks"; public override string Identifier => @"top_ranks";
public RanksSection() public RanksSection()
{ {
Children = new[] Children = new[]
{ {
new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance"), new PaginatedScoreContainer(ScoreType.Best, User, UsersStrings.ShowExtraTopRanksBestTitle),
new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks") new PaginatedScoreContainer(ScoreType.Firsts, User, UsersStrings.ShowExtraTopRanksFirstTitle)
}; };
} }
} }

3
osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
View File

@ -10,13 +10,14 @@ using osu.Game.Online.API;
using System.Collections.Generic; using System.Collections.Generic;
using osuTK; using osuTK;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections.Recent namespace osu.Game.Overlays.Profile.Sections.Recent
{ {
public class PaginatedRecentActivityContainer : PaginatedProfileSubsection<APIRecentActivity> public class PaginatedRecentActivityContainer : PaginatedProfileSubsection<APIRecentActivity>
{ {
public PaginatedRecentActivityContainer(Bindable<User> user) public PaginatedRecentActivityContainer(Bindable<User> user)
: base(user, missingText: "This user hasn't done anything notable recently!") : base(user, missingText: EventsStrings.Empty)
{ {
ItemsPerPage = 10; ItemsPerPage = 10;
} }

6
osu.Game/Overlays/Profile/Sections/RecentSection.cs
View File

@ -1,15 +1,17 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation;
using osu.Game.Overlays.Profile.Sections.Recent; using osu.Game.Overlays.Profile.Sections.Recent;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
public class RecentSection : ProfileSection public class RecentSection : ProfileSection
{ {
public override string Title => "Recent"; public override LocalisableString Title => UsersStrings.ShowExtraRecentActivityTitle;
public override string Identifier => "recent_activity"; public override string Identifier => @"recent_activity";
public RecentSection() public RecentSection()
{ {

3
osu.Game/Overlays/Profile/UserGraph.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -211,7 +212,7 @@ namespace osu.Game.Overlays.Profile
protected readonly OsuSpriteText Counter, BottomText; protected readonly OsuSpriteText Counter, BottomText;
private readonly Box background; private readonly Box background;
protected UserGraphTooltip(string tooltipCounterName) protected UserGraphTooltip(LocalisableString tooltipCounterName)
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Masking = true; Masking = true;