sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21746 from peppy/fix-language-update

Browse Source 
Closes https://github.com/ppy/osu/issues/21744
This commit is contained in:
Joseph Madamba
2022-12-21 11:06:52 -08:00
committed by GitHub
parent d81a724dd7 3ec31a5f51
commit b09c00d71b
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
View File

@ -87,18 +87,21 @@ namespace osu.Game.Overlays.FirstRunSetup
}); });
frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale); frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
frameworkLocale.BindValueChanged(_ => onLanguageChange());
localisationParameters = localisation.CurrentParameters.GetBoundCopy(); localisationParameters = localisation.CurrentParameters.GetBoundCopy();
localisationParameters.BindValueChanged(p => localisationParameters.BindValueChanged(_ => onLanguageChange(), true);
}
private void onLanguageChange()
{ {
var language = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, p.NewValue); var language = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
// Changing language may cause a short period of blocking the UI thread while the new glyphs are loaded. // Changing language may cause a short period of blocking the UI thread while the new glyphs are loaded.
// Scheduling ensures the button animation plays smoothly after any blocking operation completes. // Scheduling ensures the button animation plays smoothly after any blocking operation completes.
// Note that a delay is required (the alternative would be a double-schedule; delay feels better). // Note that a delay is required (the alternative would be a double-schedule; delay feels better).
updateSelectedDelegate?.Cancel(); updateSelectedDelegate?.Cancel();
updateSelectedDelegate = Scheduler.AddDelayed(() => updateSelectedStates(language), 50); updateSelectedDelegate = Scheduler.AddDelayed(() => updateSelectedStates(language), 50);
}, true);
} }
private void updateSelectedStates(Language language) private void updateSelectedStates(Language language)

7
osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
View File

@ -44,10 +44,13 @@ namespace osu.Game.Overlays.Settings.Sections.General
}, },
}; };
localisationParameters.BindValueChanged(p frameworkLocale.BindValueChanged(_ => updateSelection());
=> languageSelection.Current.Value = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, p.NewValue), true); localisationParameters.BindValueChanged(_ => updateSelection(), true);
languageSelection.Current.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode()); languageSelection.Current.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode());
} }
private void updateSelection() =>
languageSelection.Current.Value = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
} }
} }