diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs index fe0d9737f..e18e192b5 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs @@ -33,7 +33,7 @@ public TestSceneLyric() private void load() { var config = Dependencies.Get(); - config.SetValue(KaraokeRulesetSetting.PreferLanguage, cultureInfo); + config.SetValue(KaraokeRulesetSetting.PreferTranslationLanguage, cultureInfo); } private Drawable testSingle(double timeOffset = 0) diff --git a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs index a41c01084..35333375a 100644 --- a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs +++ b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs @@ -33,8 +33,8 @@ protected override void InitialiseDefaults() SetDefault(KaraokeRulesetSetting.NoteAlpha, 1, 0.2, 1, 0.01); SetDefault(KaraokeRulesetSetting.LyricAlpha, 1, 0.2, 1, 0.01); - // Translate - SetDefault(KaraokeRulesetSetting.PreferLanguage, new CultureInfo("en-US")); + // Translation + SetDefault(KaraokeRulesetSetting.PreferTranslationLanguage, new CultureInfo("en-US")); // Pitch SetDefault(KaraokeRulesetSetting.OverridePitchAtGameplay, false); @@ -61,8 +61,8 @@ protected override void InitialiseDefaults() SetDefault(KaraokeRulesetSetting.RomanisationFont, new FontUsage("Torus", 20, "Bold"), 8f, 48f); SetDefault(KaraokeRulesetSetting.RomanisationMargin, 0, 0, 20); SetDefault(KaraokeRulesetSetting.ForceUseDefaultFont, false); - SetDefault(KaraokeRulesetSetting.TranslateFont, new FontUsage("Torus", 18, "Bold"), 10f, 48f); - SetDefault(KaraokeRulesetSetting.ForceUseDefaultTranslateFont, false); + SetDefault(KaraokeRulesetSetting.TranslationFont, new FontUsage("Torus", 18, "Bold"), 10f, 48f); + SetDefault(KaraokeRulesetSetting.ForceUseDefaultTranslationFont, false); SetDefault(KaraokeRulesetSetting.NoteFont, new FontUsage("Torus", 12, "Bold"), 10f, 32f); SetDefault(KaraokeRulesetSetting.ForceUseDefaultNoteFont, false); } @@ -71,7 +71,7 @@ protected override void AddBindable(KaraokeRulesetSetting lookup, Bin { switch (lookup) { - case KaraokeRulesetSetting.PreferLanguage: + case KaraokeRulesetSetting.PreferTranslationLanguage: // todo : need to hve a default value here because it will cause error if object is null while saving. base.AddBindable(lookup, new BindableCultureInfo(bindable.Value as CultureInfo)); break; @@ -79,7 +79,7 @@ protected override void AddBindable(KaraokeRulesetSetting lookup, Bin case KaraokeRulesetSetting.MainFont: case KaraokeRulesetSetting.RubyFont: case KaraokeRulesetSetting.RomanisationFont: - case KaraokeRulesetSetting.TranslateFont: + case KaraokeRulesetSetting.TranslationFont: case KaraokeRulesetSetting.NoteFont: base.AddBindable(lookup, new BindableFontUsage(TypeUtils.ChangeType(bindable.Value))); break; @@ -111,7 +111,7 @@ protected BindableFontUsage SetDefault(KaraokeRulesetSetting setting, FontUsage new TrackedSetting(KaraokeRulesetSetting.ScrollTime, v => new SettingDescription(v, "Scroll Time", $"{v}ms")), new TrackedSetting(KaraokeRulesetSetting.DisplayNoteRubyText, b => new SettingDescription(b, "Toggle display", b ? "Show" : "Hide")), new TrackedSetting(KaraokeRulesetSetting.ShowCursor, b => new SettingDescription(b, "Cursor display", b ? "Show" : "Hide")), - new TrackedSetting(KaraokeRulesetSetting.PreferLanguage, c => new SettingDescription(c, "Translate language", CultureInfoUtils.GetLanguageDisplayText(c))), + new TrackedSetting(KaraokeRulesetSetting.PreferTranslationLanguage, c => new SettingDescription(c, "Translation language", CultureInfoUtils.GetLanguageDisplayText(c))), new TrackedSetting(KaraokeRulesetSetting.MicrophoneDevice, d => new SettingDescription(d, "Change to the new microphone device", d)), }; } @@ -126,8 +126,8 @@ public enum KaraokeRulesetSetting NoteAlpha, LyricAlpha, - // Translate - PreferLanguage, + // Translation + PreferTranslationLanguage, // Pitch OverridePitchAtGameplay, @@ -154,8 +154,8 @@ public enum KaraokeRulesetSetting RomanisationFont, RomanisationMargin, ForceUseDefaultFont, - TranslateFont, - ForceUseDefaultTranslateFont, + TranslationFont, + ForceUseDefaultTranslationFont, NoteFont, ForceUseDefaultNoteFont, } diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModTranslation.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModTranslation.cs index f3caec1a6..bfc5bd350 100644 --- a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModTranslation.cs +++ b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModTranslation.cs @@ -33,7 +33,7 @@ public void ApplyToDrawableHitObject(DrawableHitObject drawable) static CultureInfo? getPreferLanguage(IReadOnlyDependencyContainer dependencyContainer) { var config = dependencyContainer.Get(); - return config.Get(KaraokeRulesetSetting.PreferLanguage); + return config.Get(KaraokeRulesetSetting.PreferTranslationLanguage); } } } diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs index 47d42c26c..6b2f44acb 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs @@ -77,7 +77,7 @@ private void load(KaraokeRulesetConfigManager? config) config.BindWith(KaraokeRulesetSetting.RubyMargin, rubyMarginBindable); config.BindWith(KaraokeRulesetSetting.RomanisationFont, romanisationFontUsageBindable); config.BindWith(KaraokeRulesetSetting.RomanisationMargin, romanisationMarginBindable); - config.BindWith(KaraokeRulesetSetting.TranslateFont, translateFontUsageBindable); + config.BindWith(KaraokeRulesetSetting.TranslationFont, translateFontUsageBindable); } mainFontUsageBindable.BindValueChanged(_ => updateLyricFontInfo()); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs index 0fb173cf0..b8cf2efec 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs @@ -95,8 +95,8 @@ private void load(FontManager fontManager, IRenderer renderer, KaraokeRulesetCon config.BindWith(KaraokeRulesetSetting.MainFont, mainFont); config.BindWith(KaraokeRulesetSetting.RubyFont, rubyFont); config.BindWith(KaraokeRulesetSetting.RomanisationFont, romanisationFont); - config.BindWith(KaraokeRulesetSetting.TranslateFont, translationFont); - config.BindWith(KaraokeRulesetSetting.PreferLanguage, preferLanguage); + config.BindWith(KaraokeRulesetSetting.TranslationFont, translationFont); + config.BindWith(KaraokeRulesetSetting.PreferTranslationLanguage, preferLanguage); } protected override void Dispose(bool isDisposing) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslationSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslationSettings.cs index 2cd9eb64c..f837b6eda 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslationSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslationSettings.cs @@ -26,7 +26,7 @@ private void load() { LabelText = "Prefer language", TooltipText = "Select prefer translation.", - Current = Config.GetBindable(KaraokeRulesetSetting.PreferLanguage), + Current = Config.GetBindable(KaraokeRulesetSetting.PreferTranslationLanguage), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs index be67e2c70..ddd3dfbe7 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs @@ -59,13 +59,13 @@ private void load() new SettingsFont { LabelText = "Translation font", - Current = Config.GetBindable(KaraokeRulesetSetting.TranslateFont), + Current = Config.GetBindable(KaraokeRulesetSetting.TranslationFont), }, new SettingsCheckbox { LabelText = "Force use default translation font.", TooltipText = "Force use default font even has customize font in skin or beatmap.", - Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultTranslateFont), + Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultTranslationFont), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs index 45b694691..7c2e8dd26 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs @@ -118,7 +118,7 @@ public void ApplyTo(Drawable d) // Apply translate font. drawableLyric.ApplyToTranslateText(text => { - text.Font = getFont(KaraokeRulesetSetting.TranslateFont); + text.Font = getFont(KaraokeRulesetSetting.TranslationFont); }); FontUsage getFont(KaraokeRulesetSetting setting, FontUsage? skinFont = null) @@ -141,8 +141,8 @@ bool forceUseDefaultFont() case KaraokeRulesetSetting.RomanisationFont: return config?.Get(KaraokeRulesetSetting.ForceUseDefaultFont) ?? false; - case KaraokeRulesetSetting.TranslateFont: - return config?.Get(KaraokeRulesetSetting.ForceUseDefaultTranslateFont) ?? false; + case KaraokeRulesetSetting.TranslationFont: + return config?.Get(KaraokeRulesetSetting.ForceUseDefaultTranslationFont) ?? false; default: throw new InvalidOperationException(nameof(setting)); diff --git a/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfieldAdjustmentContainer.cs index 07929458c..0fcc9e523 100644 --- a/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfieldAdjustmentContainer.cs +++ b/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfieldAdjustmentContainer.cs @@ -33,7 +33,7 @@ private void load(FontManager fontManager, IRenderer renderer, KaraokeRulesetCon manager.Get(KaraokeRulesetSetting.MainFont), manager.Get(KaraokeRulesetSetting.RubyFont), manager.Get(KaraokeRulesetSetting.RomanisationFont), - manager.Get(KaraokeRulesetSetting.TranslateFont), + manager.Get(KaraokeRulesetSetting.TranslationFont), manager.Get(KaraokeRulesetSetting.NoteFont), };