Fix incorrectly implemented localisation

This commit is contained in:
Bartłomiej Dach 2023-04-10 15:03:33 +02:00
parent 6fec476147
commit 73bd0feef5
No known key found for this signature in database
2 changed files with 5 additions and 7 deletions

View File

@ -100,14 +100,14 @@ namespace osu.Game.Localisation
public static LocalisableString TimelineTicks => new TranslatableString(getKey(@"timeline_ticks"), @"Ticks");
/// <summary>
/// "0.0°"
/// "{0:0.0}&#176;"
/// </summary>
public static LocalisableString RotationFormatUnsnapped => new TranslatableString(getKey(@"rotation_format_unsnapped"), @"0.0°");
public static LocalisableString RotationUnsnapped(float newRotation) => new TranslatableString(getKey(@"rotation_unsnapped"), @"{0:0.0}°", newRotation);
/// <summary>
/// "0.0° (snapped)"
/// "{0:0.0}&#176; (snapped)"
/// </summary>
public static LocalisableString RotationFormatSnapped => new TranslatableString(getKey(@"rotation_format_snapped"), @"0.0° (snapped)");
public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0.0}° (snapped)", newRotation);
private static string getKey(string key) => $@"{prefix}:{key}";
}

View File

@ -7,7 +7,6 @@ using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
@ -125,8 +124,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
cumulativeRotation.Value = newRotation;
HandleRotate?.Invoke(newRotation - oldRotation);
string tooltipFormat = shouldSnap ? EditorStrings.RotationFormatSnapped.ToString() : EditorStrings.RotationFormatUnsnapped.ToString();
TooltipText = newRotation.ToLocalisableString(tooltipFormat);
TooltipText = shouldSnap ? EditorStrings.RotationSnapped(newRotation) : EditorStrings.RotationUnsnapped(newRotation);
}
private float snap(float value, float step) => MathF.Round(value / step) * step;