diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyNavigation.cs index 97009fceb..b7b5afb22 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyNavigation.cs @@ -22,12 +22,12 @@ protected override NavigationTextContainer CreateTextContainer() protected override NavigationState GetState(Lyric[] lyrics) { - // technically, all non-english lyric should have romaji. - if (lyrics.All(hasRomaji)) + // technically, all non-english lyric should have romanisation. + if (lyrics.All(hasRomanisation)) return NavigationState.Done; // not all (japanese) lyric contains ruby, so it's ok with that. - if (lyrics.Any(hasRuby) || lyrics.Any(hasRomaji)) + if (lyrics.Any(hasRuby) || lyrics.Any(hasRomanisation)) return NavigationState.Working; return NavigationState.Initial; @@ -35,8 +35,8 @@ protected override NavigationState GetState(Lyric[] lyrics) static bool hasRuby(Lyric lyric) => lyric.RubyTags.Any(); - static bool hasRomaji(Lyric lyric) - => lyric.RubyTags.Any(); + static bool hasRomanisation(Lyric lyric) + => lyric.TimeTags.Any(x => !string.IsNullOrEmpty(x.RomanisedSyllable)); } protected override LocalisableString GetNavigationText(NavigationState value) => 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 afaaf5fa6..f76e24e26 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 @@ -47,7 +47,7 @@ protected override void LoadComplete() { base.LoadComplete(); - // todo: we should better way to switch between time-tag mode or romaji mode. + // todo: we should better way to switch between time-tag mode or romanisation mode. // or even create new step for it. if (lyricPropertyAutoGenerateChangeHandler.CanGenerate(AutoGenerateType.AutoGenerateRomanisation)) { @@ -92,7 +92,7 @@ internal void AskForAutoGenerateRomanisation() { SwitchLyricEditorMode(LyricEditorMode.EditRomanisation); - DialogOverlay.Push(new UseAutoGenerateRomajiPopupDialog(ok => + DialogOverlay.Push(new UseAutoGenerateRomanisationPopupDialog(ok => { if (!ok) return; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/UseAutoGenerateRomajiPopupDialog.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/UseAutoGenerateRomanisationPopupDialog.cs similarity index 71% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/UseAutoGenerateRomajiPopupDialog.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/UseAutoGenerateRomanisationPopupDialog.cs index e3d9dc28e..eba6a0d9b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/UseAutoGenerateRomajiPopupDialog.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/UseAutoGenerateRomanisationPopupDialog.cs @@ -7,13 +7,13 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateTimeTag; -public partial class UseAutoGenerateRomajiPopupDialog : PopupDialog +public partial class UseAutoGenerateRomanisationPopupDialog : PopupDialog { - public UseAutoGenerateRomajiPopupDialog(Action okAction) + public UseAutoGenerateRomanisationPopupDialog(Action okAction) { Icon = FontAwesome.Solid.Globe; - HeaderText = "Auto generate romaji"; - BodyText = "Would you like to use romaji generator to auto generate each lyric's romaji?"; + HeaderText = "Auto generate romanisation"; + BodyText = "Would you like to use generator to auto generate each lyric's romanisation?"; Buttons = new PopupDialogButton[] { new PopupDialogOkButton