diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs index 4626aa571..83ff1d8c6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs @@ -195,10 +195,10 @@ public void TestAutoGenerateTimeTagsWithNonSupportedLyric() #endregion - #region Time-tag romaji + #region Romanisation [Test] - public void TestAutoGenerateTimeTagRomaji() + public void TestAutoGenerateRomanisation() { PrepareHitObject(() => new Lyric { @@ -207,7 +207,7 @@ public void TestAutoGenerateTimeTagRomaji() TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { "[0,start]", "[3,end]" }), }); - TriggerHandlerChanged(c => c.AutoGenerate(AutoGenerateType.AutoGenerateTimeTagRomaji)); + TriggerHandlerChanged(c => c.AutoGenerate(AutoGenerateType.AutoGenerateRomanisation)); AssertSelectedHitObject(h => { @@ -216,7 +216,7 @@ public void TestAutoGenerateTimeTagRomaji() } [Test] - public void TestAutoGenerateTimeTagRomajiWithNonSupportedLyric() + public void TestAutoGenerateRomanisationWithNonSupportedLyric() { PrepareHitObjects(() => new[] { @@ -228,7 +228,7 @@ public void TestAutoGenerateTimeTagRomajiWithNonSupportedLyric() }, }); - TriggerHandlerChangedWithException(c => c.AutoGenerate(AutoGenerateType.AutoGenerateTimeTagRomaji)); + TriggerHandlerChangedWithException(c => c.AutoGenerate(AutoGenerateType.AutoGenerateRomanisation)); } #endregion @@ -301,7 +301,7 @@ public void ChangeWithNormalLyric([Values] AutoGenerateType type) PrepareHitObject(() => new Lyric { Text = "karaoke", - Language = new CultureInfo(17), // for auto-generate ruby and romaji. + Language = new CultureInfo(17), // for auto-generate ruby and romanisation. TimeTags = new[] // for auto-generate notes. { new TimeTag(new TextIndex(0), 0), @@ -361,7 +361,7 @@ public void CheckWithReferencedLyric([Values] AutoGenerateType type) PrepareHitObject(() => new Lyric { Text = "karaoke", - Language = new CultureInfo(17), // for auto-generate ruby and romaji. + Language = new CultureInfo(17), // for auto-generate ruby and romanisation. TimeTags = new[] // for auto-generate notes. { new TimeTag(new TextIndex(0), 0), diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricPropertyAutoGenerateChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricPropertyAutoGenerateChangeHandler.cs index 99d0bfb08..5b4dac8ea 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricPropertyAutoGenerateChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricPropertyAutoGenerateChangeHandler.cs @@ -22,7 +22,7 @@ public enum AutoGenerateType AutoGenerateTimeTags, - AutoGenerateTimeTagRomaji, + AutoGenerateRomanisation, AutoGenerateNotes, } diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandler.cs index c4abe696e..110ca0a19 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandler.cs @@ -54,7 +54,7 @@ public bool CanGenerate(AutoGenerateType type) var timeTagGenerator = getSelector(); return canGenerate(timeTagGenerator); - case AutoGenerateType.AutoGenerateTimeTagRomaji: + case AutoGenerateType.AutoGenerateRomanisation: var timeTagRomajiGenerator = getSelector, RomanisationGeneratorConfig>(); return canGenerate(timeTagRomajiGenerator); @@ -95,7 +95,7 @@ public IDictionary GetGeneratorNotSupportedLyrics(Auto var timeTagGenerator = getSelector(); return getInvalidMessageFromGenerator(timeTagGenerator); - case AutoGenerateType.AutoGenerateTimeTagRomaji: + case AutoGenerateType.AutoGenerateRomanisation: var timeTagRomajiGenerator = getSelector, RomanisationGeneratorConfig>(); return getInvalidMessageFromGenerator(timeTagRomajiGenerator); @@ -170,7 +170,7 @@ public void AutoGenerate(AutoGenerateType type) }); break; - case AutoGenerateType.AutoGenerateTimeTagRomaji: + case AutoGenerateType.AutoGenerateRomanisation: var timeTagRomajiGenerator = getSelector, RomanisationGeneratorConfig>(); PerformOnSelection(lyric => { @@ -213,7 +213,7 @@ protected override bool IsWritePropertyLocked(Lyric lyric) => AutoGenerateType.DetectLanguage => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.Language)), AutoGenerateType.AutoGenerateRubyTags => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.RubyTags)), AutoGenerateType.AutoGenerateTimeTags => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.TimeTags)), - AutoGenerateType.AutoGenerateTimeTagRomaji => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.TimeTags)), + AutoGenerateType.AutoGenerateRomanisation => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.TimeTags)), AutoGenerateType.AutoGenerateNotes => HitObjectWritableUtils.IsCreateOrRemoveNoteLocked(lyric), _ => throw new ArgumentOutOfRangeException(), }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs index 8566ea578..e63648df5 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs @@ -21,7 +21,7 @@ private partial class RomanisationAutoGenerateSubsection : LyricEditorAutoGenera private const string time_tag_mode = "TIME_TAG_MODE"; public RomanisationAutoGenerateSubsection() - : base(AutoGenerateType.AutoGenerateTimeTagRomaji) + : base(AutoGenerateType.AutoGenerateRomanisation) { } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs index 9201b43ca..afaaf5fa6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs @@ -49,7 +49,7 @@ protected override void LoadComplete() // todo: we should better way to switch between time-tag mode or romaji mode. // or even create new step for it. - if (lyricPropertyAutoGenerateChangeHandler.CanGenerate(AutoGenerateType.AutoGenerateTimeTagRomaji)) + if (lyricPropertyAutoGenerateChangeHandler.CanGenerate(AutoGenerateType.AutoGenerateRomanisation)) { AskForAutoGenerateRomanisation(); }