h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 05:22:54 +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
commit 72aa65206d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Desktop/Windows/WindowsAssociationManager.cs
View File

@ -148,15 +148,7 @@ namespace osu.Desktop.Windows
foreach (var association in uri_associations) foreach (var association in uri_associations)
association.UpdateDescription(getLocalisedString(association.Description)); association.UpdateDescription(getLocalisedString(association.Description));
string getLocalisedString(LocalisableString s) string getLocalisedString(LocalisableString s) => localisation?.GetLocalisedString(s) ?? s.ToString();
{
if (localisation == null)
return s.ToString();
var b = localisation.GetLocalisedBindableString(s);
b.UnbindAll();
return b.Value;
}
} }
#region Native interop #region Native interop

4
osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
View File

@ -114,10 +114,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows || RuntimeInfo.OS == RuntimeInfo.Platform.Linux) if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows || RuntimeInfo.OS == RuntimeInfo.Platform.Linux)
{ {
t.NewLine(); t.NewLine();
var formattedSource = MessageFormatter.FormatText(localisation.GetLocalisedBindableString(TabletSettingsStrings.NoTabletDetectedDescription( var formattedSource = MessageFormatter.FormatText(localisation.GetLocalisedString(TabletSettingsStrings.NoTabletDetectedDescription(
RuntimeInfo.OS == RuntimeInfo.Platform.Windows RuntimeInfo.OS == RuntimeInfo.Platform.Windows
? @"https://opentabletdriver.net/Wiki/FAQ/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); t.AddLinks(formattedSource.Text, formattedSource.Links);
} }
}), }),