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

Merge pull request #18433 from Joehuu/use-exisiting-chat-translations 

Use existing web localisation for chat strings
This commit is contained in:
Dean Herbert 2022-05-27 14:50:54 +09:00 committed by GitHub
parent 198afb6aa7 105d581f24
commit ab444c213f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
View File

@ -7,14 +7,17 @@
using System.Linq;
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat.Listing;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Chat.ChannelList
{
@ -57,13 +60,13 @@ private void load(OverlayColourProvider colourProvider)
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
new ChannelListLabel("CHANNELS"),
new ChannelListLabel(ChatStrings.ChannelsListTitlePUBLIC.ToUpper()),
publicChannelFlow = new ChannelListItemFlow(),
selector = new ChannelListItem(ChannelListingChannel)
{
Margin = new MarginPadding { Bottom = 10 },
},
new ChannelListLabel("DIRECT MESSAGES"),
new ChannelListLabel(ChatStrings.ChannelsListTitlePM.ToUpper()),
privateChannelFlow = new ChannelListItemFlow(),
},
},
@ -126,7 +129,7 @@ private ChannelListItemFlow getFlowForChannel(Channel channel)
private class ChannelListLabel : OsuSpriteText
{
public ChannelListLabel(string label)
public ChannelListLabel(LocalisableString label)
{
Text = label;
Margin = new MarginPadding { Left = 18, Bottom = 5 };

3
osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
View File

@ -13,6 +13,7 @@
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web;
using osuTK;
using osuTK.Graphics;
@ -58,7 +59,7 @@ private void load(OverlayColourProvider colourProvider, TextureStore textures)
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Text = "osu!chat",
Text = ChatStrings.TitleCompact,
Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
Margin = new MarginPadding { Bottom = 2f },
},

5
osu.Game/Overlays/Chat/ChatTextBar.cs
View File

@ -14,6 +14,7 @@
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using osu.Game.Resources.Localisation.Web;
using osuTK;
namespace osu.Game.Overlays.Chat
@ -141,11 +142,11 @@ protected override void LoadComplete()
switch (newChannel?.Type)
{
case ChannelType.Public:
chattingText.Text = $"chatting in {newChannel.Name}";
chattingText.Text = ChatStrings.TalkingIn(newChannel.Name);
break;
case ChannelType.PM:
chattingText.Text = $"chatting with {newChannel.Name}";
chattingText.Text = ChatStrings.TalkingWith(newChannel.Name);
break;
default:

3
osu.Game/Overlays/Chat/ChatTextBox.cs
View File

@ -5,6 +5,7 @@
using osu.Framework.Bindables;
using osu.Game.Graphics.UserInterface;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.Chat
{
@ -22,7 +23,7 @@ protected override void LoadComplete()
{
bool showSearch = change.NewValue;
PlaceholderText = showSearch ? "type here to search" : "type here";
PlaceholderText = showSearch ? HomeStrings.SearchPlaceholder : ChatStrings.InputPlaceholder;
Text = string.Empty;
}, true);
}