h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-24 06:11:18 +08:00
Code Issues Releases Wiki Activity

Merge pull request #30965 from Susko3/use-GetLocalisedString

Browse Source 
Use `LocalisationManager.GetLocalisedString()` instead of bindable hack
This commit is contained in:
Dean Herbert
2024-12-04 23:34:32 -08:00
committed by GitHub
Unverified
parent aa0ee5cf3a 837744b0aa
commit 72aa65206d
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Desktop/Windows/WindowsAssociationManager.cs
+1 -9
View File
@@ -148,15 +148,7 @@ namespace osu.Desktop.Windows
foreach (var association in uri_associations)
association.UpdateDescription(getLocalisedString(association.Description));
string getLocalisedString(LocalisableString s)
{
if (localisation == null)
return s.ToString();
var b = localisation.GetLocalisedBindableString(s);
b.UnbindAll();
return b.Value;
}
string getLocalisedString(LocalisableString s) => localisation?.GetLocalisedString(s) ?? s.ToString();
}
#region Native interop
osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+2 -2
View File
@@ -114,10 +114,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows || RuntimeInfo.OS == RuntimeInfo.Platform.Linux)
{
t.NewLine();
var formattedSource = MessageFormatter.FormatText(localisation.GetLocalisedBindableString(TabletSettingsStrings.NoTabletDetectedDescription(
var formattedSource = MessageFormatter.FormatText(localisation.GetLocalisedString(TabletSettingsStrings.NoTabletDetectedDescription(
RuntimeInfo.OS == RuntimeInfo.Platform.Windows
? @"https://opentabletdriver.net/Wiki/FAQ/Windows"
: @"https://opentabletdriver.net/Wiki/FAQ/Linux")).Value);
: @"https://opentabletdriver.net/Wiki/FAQ/Linux")));
t.AddLinks(formattedSource.Text, formattedSource.Links);
}
}),