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

Remove @ from to-be-localized strings

Browse Source
This commit is contained in:
DrabWeb 2017-05-24 02:19:45 -03:00
parent be1ae2bd8e
commit b08668b6d9
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Direct/DirectGridPanel.cs
View File

@ -127,7 +127,7 @@ namespace osu.Game.Overlays.Direct
{
new OsuSpriteText
{
Text = @"mapped by ",
Text = "mapped by ",
TextSize = 14,
Shadow = false,
Colour = colours.Gray5,
@ -150,7 +150,7 @@ namespace osu.Game.Overlays.Direct
{
new OsuSpriteText
{
Text = $@"from {SetInfo.Metadata.Source}",
Text = $"from {SetInfo.Metadata.Source}",
TextSize = 14,
Shadow = false,
Colour = colours.Gray5,

4
osu.Game/Overlays/Direct/DirectListPanel.cs
View File

@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Direct
{
new OsuSpriteText
{
Text = @"mapped by ",
Text = "mapped by ",
TextSize = 14,
},
new OsuSpriteText
@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Direct
},
new OsuSpriteText
{
Text = $@"from {SetInfo.Metadata.Source}",
Text = $"from {SetInfo.Metadata.Source}",
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
TextSize = 14,

5
osu.Game/Overlays/Direct/FilterControl.cs
View File

@ -51,8 +51,7 @@ namespace osu.Game.Overlays.Direct
tabStrip = new Box
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Position = new Vector2(0f, 1f),
Origin = Anchor.TopLeft,
RelativeSizeAxes = Axes.X,
Height = 1,
},
@ -87,7 +86,7 @@ namespace osu.Game.Overlays.Direct
Origin = Anchor.TopRight,
Spacing = new Vector2(10f, 0f),
Direction = FillDirection.Horizontal,
Margin = new MarginPadding { Top = Height - SlimEnumDropdown<DirectTab>.HEIGHT - padding, Right = DirectOverlay.WIDTH_PADDING },
Margin = new MarginPadding { Top = HEIGHT - SlimEnumDropdown<DirectTab>.HEIGHT - padding, Right = DirectOverlay.WIDTH_PADDING },
Children = new Drawable[]
{
new FillFlowContainer

28
osu.Game/Overlays/DirectOverlay.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Overlays
private const float panel_padding = 10f;
private readonly FilterControl filter;
private readonly FillFlowContainer resultCountsContainer;
private readonly FillFlowContainer resultCountsContainer;
private readonly OsuSpriteText resultCountsText;
private readonly FillFlowContainer<DirectPanel> panels;
@ -115,7 +115,7 @@ namespace osu.Game.Overlays
{
new OsuSpriteText
{
Text = @"Found ",
Text = "Found ",
TextSize = 15,
},
resultCountsText = new OsuSpriteText
@ -164,18 +164,18 @@ namespace osu.Game.Overlays
resultCountsContainer.Colour = colours.Yellow;
}
private void updateResultCounts()
{
resultCountsContainer.FadeTo(ResultCounts == null ? 0f : 1f, 200, EasingTypes.Out);
if (ResultCounts == null) return;
resultCountsText.Text = pluralize(@"Artist", ResultCounts.Artists) + ", " +
pluralize(@"Song", ResultCounts.Songs) + ", " +
pluralize(@"Tag", ResultCounts.Tags);
}
private string pluralize(string prefix, int value)
{
private void updateResultCounts()
{
resultCountsContainer.FadeTo(ResultCounts == null ? 0f : 1f, 200, EasingTypes.Out);
if (ResultCounts == null) return;
resultCountsText.Text = pluralize("Artist", ResultCounts.Artists) + ", " +
pluralize("Song", ResultCounts.Songs) + ", " +
pluralize("Tag", ResultCounts.Tags);
}
private string pluralize(string prefix, int value)
{
return $@"{value} {prefix}" + (value == 1 ? string.Empty : @"s");
}