From 63cd0b6dba7c39d1dbbd586be3e674eaed6bcf37 Mon Sep 17 00:00:00 2001 From: Ne_Eo Date: Fri, 17 Jan 2025 15:46:10 +0100 Subject: [PATCH] Some changes to the Editors.xml --- assets/languages/en/AlphabetEditor.xml | 62 -- assets/languages/en/Editors.xml | 838 ++++++++++-------- .../funkin/backend/utils/TranslationUtil.hx | 3 +- .../funkin/editors/alphabet/AlphabetEditor.hx | 2 +- .../editors/alphabet/AlphabetSelection.hx | 4 +- .../editors/character/CharacterSelection.hx | 2 +- source/funkin/editors/charter/Charter.hx | 132 +-- .../editors/charter/CharterSelection.hx | 2 +- 8 files changed, 517 insertions(+), 528 deletions(-) delete mode 100644 assets/languages/en/AlphabetEditor.xml diff --git a/assets/languages/en/AlphabetEditor.xml b/assets/languages/en/AlphabetEditor.xml deleted file mode 100644 index d3f3d198..00000000 --- a/assets/languages/en/AlphabetEditor.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - Press ACCEPT to edit this typeface. - New Typeface - Select a typeface to edit - - - New Typeface: Feature Not Implemented! - This feature isn't implemented yet. Please wait for more cne updates to have this functional.\n\n\n- Codename Devs - - - - - Alphabet Editor - - - File - - New - Save - Save As... - Exit - - - Edit - - Undo - Redo - - - Glyph - - New Glyph - Edit Glyph - Delete Glyph - - - Offsets - - Move Left - Move Up - Move Down - Move Right - Move Extra Left - Move Extra Up - Move Extra Down - Move Extra Right - Clear Offsets - - - View - - Zoom in - Zoom out - Reset Zoom - - - - \ No newline at end of file diff --git a/assets/languages/en/Editors.xml b/assets/languages/en/Editors.xml index 0f35b716..25edfbcb 100644 --- a/assets/languages/en/Editors.xml +++ b/assets/languages/en/Editors.xml @@ -1,410 +1,460 @@ - - Autosaving in {0} seconds{1} - (Canceled)! + + Autosaving in {0} seconds{1} + (Canceled)! - Ok - Cancel - Save - Save & Close - Close + Ok + Cancel + Save + Save & Close + Close - - Select a song to modify the charts from." - Press ACCEPT to choose a difficulty to edit. - Press ACCEPT to edit the chart for the selected difficulty. - Select a difficulty to continue. - New Difficulty - New Song - - - Creating Song: Error! - The song you are trying to create already exists, if you would like to override it delete the song first! - Creating Chart: Error! - The chart you are trying to create already exists, if you would like to override it delete the chart first! - - - - - Creating New Chart - Chart Info - Difficulty Name - Stage - Scroll Speed - - Strumlines $* Atleast 1 Strumline Required$ - Strumline - #{0} - - - - Chart Properties - Edit Chart Data - Stage - Scroll Speed - - - - Step: {0} - Beat: {0} - Measure: {0} - BPM: {0} - Time Signature: {0}/{1} - - - - Create Event Group - Edit Event Group - - No Event - - Strumline #{0} ({1}) - - - - Choose an event type... - - - - Edit Metadata - - Song Data - Song Name - BPM - Time Signature - Menus Data (Freeplay/Story) - Display Name - Icon - Modes Allowed - Color - Difficulties - Custom Values (Advanced) - - Opponent Mode - Co-op Mode - - - - Note Types List Editor - - Edit Note Types - Note Type {0} - - - - Creating strumline {0} - Editing strumline {0} properties - - Create New Strumline - Edit Strumline Properties - - - - Creating New Song - Song Info - - Inst Audio File $* Required*$ - Vocal Audio File $* Required*$ - - Back - Next - - - - Characters - New Char - Type - Scroll Speed - Stage Position - Scale - Hud Position (X [Ratio 0-1],Y) - Visible? - Uses charts scroll speed? - Vocal Suffix - - - - Chart Editor - - - - File - - New - Save - Save As... - Save Without Events - Save Without Events As... - Save Events Separately - Save Events Separately As... - Save Meta - Save Meta As... - Export For FNF Legacy... - Export For Psych Engine... - Exit - - - Edit - - Undo - Redo - Copy - Paste - Cut - Delete - - - Chart - - Playtest - Playtest here - Playtest as opponent - Playtest as opponent here - Enable scripts during playtesting - Edit chart data - Edit metadata information - - - View - - Zoom in - Zoom out - Reset Zoom - Show Sections Separator - Show Beats Separator - Low Detail Waveforms - - - Song - - Go back to the start - Go forward to the end - Mute instrumental - Mute voices - - - Note - - Add sustain length - Subtract sustain length - Select all - Select measure - Edit Note Types List - - Snap - - ↑ Grid Snap - Reset Grid Snap - ↓ Grid Snap - - {0}x Grid Snap - - - Playback - - Play/Pause - ↑ Speed {0}% - Reset Speed - ↓ Speed {0}% - Go back a section - Go forward a section - Metronome - Visual metronome - - - - - Default Note - - - - - - - - HScript Call - Camera Movement - Add Camera Zoom - Camera Modulo Change - Camera Flash - BPM Change - Scroll Speed Change - Alt Animation Toggle - Play Animation - - - - Options ↓ - - Hitsounds - Mute Vocals - Edit - Delete - - No Waveform - - - Create New - Lock/Unlock - - - Add Event - Edit - Delete Event - - - Saved chart at {0}! - - - - - - - Press ACCEPT to edit this folder. - Press ACCEPT to edit this character. - New Character - Select a character to edit - Select a character to edit in {0} - - - New Character: Feature Not Implemented! - This feature isn't implemented yet. Please wait for more cne updates to have this functional.\n\n\n- Codename Devs - - - - - Creating Animation - Animation {0} properties - - Create New Animation - Edit Animation Properties - - Name - Animation - FPS - Looped - Looping - Indices - Offset (X,Y) - - - - Editing Character - - Sprite Data - - Sprite - Icon - Game Over Character - Antialiasing - Antialiased - Flip X - Flipped - Icon Color - - Character Data - - Position (X,Y) - Camera Position (X,Y) - Scale - Sing Duration (Steps) - Custom Values (Advanced) - Is Player - Is GF - - - - Character Editor - - - File - - New - Save - Save As... - Exit - - - Edit - - Undo - Redo - - - Character - - New Animation - Edit Animation - Delete Animation - Edit Info - - - Playback - - Play Animation - Stop Animation - - - Offsets - - Move Left - Move Up - Move Down - Move Right - Move Extra Left - Move Extra Up - Move Extra Down - Move Extra Right - Clear Offsets - - - View - - Zoom in - Zoom out - Reset Zoom - - - - - Character Animations - - - Character Properties - - New Character - Edit Character Info - - - {0} Animations - Flipped: {0} - Sprite: {0} - Anim: {0} - Offset: ({0}, {1}) - - Invalid Character - - - - Stage Editor - - - + + Chart Editor + Character Editor + Stage Editor UI Debug State - - - Wiki + Debug Options + Alphabet Editor - - Debug Options + + + Select a song to modify the charts from." + Press ACCEPT to choose a difficulty to edit. + Press ACCEPT to edit the chart for the selected difficulty. + Select a difficulty to continue. + New Difficulty + New Song + + + + Creating New Chart + Chart Info + Difficulty Name + Stage + Scroll Speed + + Strumlines $* Atleast 1 Strumline Required$ + Strumline - #{0} + + + Creating Song: Error! + The song you are trying to create already exists, if you would like to override it delete the song first! + Creating Chart: Error! + The chart you are trying to create already exists, if you would like to override it delete the chart first! + + + + + Chart Properties + Edit Chart Data + Stage + Scroll Speed + + + + Step: {0} + Beat: {0} + Measure: {0} + BPM: {0} + Time Signature: {0}/{1} + + + + Create Event Group + Edit Event Group + + No Event + + Strumline #{0} ({1}) + + + + Choose an event type... + + + + Edit Metadata + + Song Data + Song Name + BPM + Time Signature + Menus Data (Freeplay/Story) + Display Name + Icon + Modes Allowed + Color + Difficulties + Custom Values (Advanced) + + Opponent Mode + Co-op Mode + + + + Note Types List Editor + + Edit Note Types + Note Type {0} + + + + Creating strumline {0} + Editing strumline {0} properties + + Create New Strumline + Edit Strumline Properties + + + + Creating New Song + Song Info + + Inst Audio File $* Required*$ + Vocal Audio File $* Required*$ + + Back + Next + + + + Characters + New Char + Type + Scroll Speed + Stage Position + Scale + Hud Position (X [Ratio 0-1],Y) + Visible? + Uses charts scroll speed? + Vocal Suffix + + + + + + File + + New + Save + Save As... + Save Without Events + Save Without Events As... + Save Events Separately + Save Events Separately As... + Save Meta + Save Meta As... + Export For FNF Legacy... + Export For Psych Engine... + Exit + + + Edit + + Undo + Redo + Copy + Paste + Cut + Delete + + + Chart + + Playtest + Playtest here + Playtest as opponent + Playtest as opponent here + Enable scripts during playtesting + Edit chart data + Edit metadata information + + + View + + Zoom in + Zoom out + Reset Zoom + Show Sections Separator + Show Beats Separator + Low Detail Waveforms + + + Song + + Go back to the start + Go forward to the end + Mute instrumental + Mute voices + + + Note + + Add sustain length + Subtract sustain length + Select all + Select measure + Edit Note Types List + + Snap + + ↑ Grid Snap + Reset Grid Snap + ↓ Grid Snap + + {0}x Grid Snap + + + Playback + + Play/Pause + ↑ Speed {0}% + Reset Speed + ↓ Speed {0}% + Go back a section + Go forward a section + Metronome + Visual metronome + + + + + Default Note + + + + + + + + HScript Call + Camera Movement + Add Camera Zoom + Camera Modulo Change + Camera Flash + BPM Change + Scroll Speed Change + Alt Animation Toggle + Play Animation + + + + Options ↓ + + Hitsounds + Mute Vocals + Edit + Delete + + No Waveform + + + Create New + Lock/Unlock + + + Add Event + Edit + Delete Event + + + Saved chart at {0}! + + + + + + + Press ACCEPT to edit this folder. + Press ACCEPT to edit this character. + New Character + Select a character to edit + Select a character to edit in {0} + + + New Character: Feature Not Implemented! + This feature isn't implemented yet. Please wait for more cne updates to have this functional.\n\n\n- Codename Devs + + + + + Creating Animation + Animation {0} properties + + Create New Animation + Edit Animation Properties + + Name + Animation + FPS + Looped + Looping + Indices + Offset (X,Y) + + + + Editing Character + + Sprite Data + + Sprite + Icon + Game Over Character + Antialiasing + Antialiased + Flip X + Flipped + Icon Color + + Character Data + + Position (X,Y) + Camera Position (X,Y) + Scale + Sing Duration (Steps) + Custom Values (Advanced) + Is Player + Is GF + + + + + File + + New + Save + Save As... + Exit + + + Edit + + Undo + Redo + + + Character + + New Animation + Edit Animation + Delete Animation + Edit Info + + + Playback + + Play Animation + Stop Animation + + + Offsets + + Move Left + Move Up + Move Down + Move Right + Move Extra Left + Move Extra Up + Move Extra Down + Move Extra Right + Clear Offsets + + + View + + Zoom in + Zoom out + Reset Zoom + + + + + Character Animations + + + Character Properties + + New Character + Edit Character Info + + + {0} Animations + Flipped: {0} + Sprite: {0} + Anim: {0} + Offset: ({0}, {1}) + + Invalid Character + + + + + + Press ACCEPT to edit this typeface. + New Typeface + Select a typeface to edit + + + New Typeface: Feature Not Implemented! + This feature isn't implemented yet. Please wait for more cne updates to have this functional.\n\n\n- Codename Devs + + + + + + File + + New + Save + Save As... + Exit + + + Edit + + Undo + Redo + + + Glyph + + New Glyph + Edit Glyph + Delete Glyph + + + Offsets + + Move Left + Move Up + Move Down + Move Right + Move Extra Left + Move Extra Up + Move Extra Down + Move Extra Right + Clear Offsets + + + View + + Zoom in + Zoom out + Reset Zoom + + + - + (Chart Playtesting) Exit Game diff --git a/source/funkin/backend/utils/TranslationUtil.hx b/source/funkin/backend/utils/TranslationUtil.hx index d44b8304..2a3bfcfe 100644 --- a/source/funkin/backend/utils/TranslationUtil.hx +++ b/source/funkin/backend/utils/TranslationUtil.hx @@ -266,12 +266,13 @@ final class TranslationUtil } var langNode = xml.node.language; + var prefix = langNode.getAtt("prefix").getDefault(""); //if (langNode.has.name) { // getConfig(lang).set("name", langNode.att.name); //} - parseXml(langNode); + parseXml(langNode, prefix); } for(pair in translations) { diff --git a/source/funkin/editors/alphabet/AlphabetEditor.hx b/source/funkin/editors/alphabet/AlphabetEditor.hx index ffd8f857..4824807e 100644 --- a/source/funkin/editors/alphabet/AlphabetEditor.hx +++ b/source/funkin/editors/alphabet/AlphabetEditor.hx @@ -32,7 +32,7 @@ class AlphabetEditor extends UIState { } inline function translate(id:String, ?args:Array) - return TU.translate("alphabetEditor." + id, args); + return TU.translate("editor.alphabet." + id, args); public var tape:Alphabet; public var bigletter:Alphabet; diff --git a/source/funkin/editors/alphabet/AlphabetSelection.hx b/source/funkin/editors/alphabet/AlphabetSelection.hx index 87b7412a..1b8155ee 100644 --- a/source/funkin/editors/alphabet/AlphabetSelection.hx +++ b/source/funkin/editors/alphabet/AlphabetSelection.hx @@ -12,7 +12,7 @@ import haxe.io.Path; class AlphabetSelection extends EditorTreeMenu { inline function translate(id:String, ?args:Array) - return TU.translate("alphabetSelection." + id, args); + return TU.translate("editor.alphabet.selection." + id, args); public override function create() { @@ -37,7 +37,7 @@ class AlphabetSelection extends EditorTreeMenu ])); })); - main = new OptionsScreen(TU.translate("alphabetEditor.name"), translate("desc"), list); + main = new OptionsScreen(TU.translate("editor.alphabet.name"), translate("desc"), list); DiscordUtil.call("onEditorTreeLoaded", ["Alphabet Editor"]); } diff --git a/source/funkin/editors/character/CharacterSelection.hx b/source/funkin/editors/character/CharacterSelection.hx index b7a83adb..c3330496 100644 --- a/source/funkin/editors/character/CharacterSelection.hx +++ b/source/funkin/editors/character/CharacterSelection.hx @@ -58,7 +58,7 @@ class CharacterSelection extends EditorTreeMenu var list = generateList(modsList, isMods); - main = new OptionsScreen(TU.translate("characterEditor.name"), translate("desc"), list); + main = new OptionsScreen(TU.translate("editor.character.name"), translate("desc"), list); DiscordUtil.call("onEditorTreeLoaded", ["Character Editor"]); } diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 47876bef..b9734e39 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -106,152 +106,152 @@ class Charter extends UIState { public override function create() { super.create(); - WindowUtils.suffix = " (" + TU.translate("charter.name") + ")"; + WindowUtils.suffix = " (" + TU.translate("editor.chart.name") + ")"; SaveWarning.selectionClass = CharterSelection; SaveWarning.saveFunc = () -> {_file_save(null);}; topMenu = [ { - label: TU.translate("charter.topBar.file"), + label: TU.translate("chart.topBar.file"), childs: [ { - label: TU.translate("charter.file.new") + label: TU.translate("chart.file.new") }, null, { - label: TU.translate("charter.file.save"), + label: TU.translate("chart.file.save"), keybind: [CONTROL, S], onSelect: _file_save, }, { - label: TU.translate("charter.file.saveAs"), + label: TU.translate("chart.file.saveAs"), keybind: [CONTROL, SHIFT, S], onSelect: _file_saveas, }, null, { - label: TU.translate("charter.file.saveWithoutEvents"), + label: TU.translate("chart.file.saveWithoutEvents"), keybind: [CONTROL, ALT, TAB, S], onSelect: _file_save_no_events, }, { - label: TU.translate("charter.file.saveWithoutEventsAs"), + label: TU.translate("chart.file.saveWithoutEventsAs"), keybind: [CONTROL, SHIFT, ALT, TAB, S], onSelect: _file_saveas_no_events, }, { - label: TU.translate("charter.file.saveEventsSeparately"), + label: TU.translate("chart.file.saveEventsSeparately"), keybind: [CONTROL, TAB, S], onSelect: _file_events_save, }, { - label: TU.translate("charter.file.saveEventsSeparatelyAs"), + label: TU.translate("chart.file.saveEventsSeparatelyAs"), keybind: [CONTROL, SHIFT, TAB, S], onSelect: _file_events_saveas, }, null, { - label: TU.translate("charter.file.saveMeta"), + label: TU.translate("chart.file.saveMeta"), keybind: [CONTROL, ALT, S], onSelect: _file_meta_save, }, { - label: TU.translate("charter.file.saveMetaAs"), + label: TU.translate("chart.file.saveMetaAs"), keybind: [CONTROL, ALT ,SHIFT, S], onSelect: _file_meta_saveas, }, null, { - label: TU.translate("charter.file.exportFnfLegacy"), + label: TU.translate("chart.file.exportFnfLegacy"), onSelect: _file_saveas_fnflegacy, }, { - label: TU.translate("charter.file.exportPsych"), + label: TU.translate("chart.file.exportPsych"), onSelect: _file_saveas_psych, }, null, { - label: TU.translate("charter.file.exit"), + label: TU.translate("chart.file.exit"), onSelect: _file_exit } ] }, { - label: TU.translate("charter.topBar.edit"), + label: TU.translate("chart.topBar.edit"), childs: [ { - label: TU.translate("charter.edit.undo"), + label: TU.translate("chart.edit.undo"), keybind: [CONTROL, Z], onSelect: _edit_undo }, { - label: TU.translate("charter.edit.redo"), + label: TU.translate("chart.edit.redo"), keybinds: [[CONTROL, Y], [CONTROL, SHIFT, Z]], onSelect: _edit_redo }, null, { - label: TU.translate("charter.edit.copy"), + label: TU.translate("chart.edit.copy"), keybind: [CONTROL, C], onSelect: _edit_copy }, { - label: TU.translate("charter.edit.paste"), + label: TU.translate("chart.edit.paste"), keybind: [CONTROL, V], onSelect: _edit_paste }, null, { - label: TU.translate("charter.edit.cut"), + label: TU.translate("chart.edit.cut"), keybind: [CONTROL, X], onSelect: _edit_cut }, { - label: TU.translate("charter.edit.delete"), + label: TU.translate("chart.edit.delete"), keybind: [DELETE], onSelect: _edit_delete } ] }, { - label: TU.translate("charter.topBar.chart"), + label: TU.translate("chart.topBar.chart"), childs: [ { - label: TU.translate("charter.chart.playtest"), + label: TU.translate("chart.chart.playtest"), keybind: [ENTER], onSelect: _chart_playtest }, { - label: TU.translate("charter.chart.playtestHere"), + label: TU.translate("chart.chart.playtestHere"), keybind: [SHIFT, ENTER], onSelect: _chart_playtest_here }, null, { - label: TU.translate("charter.chart.playtestOpponent"), + label: TU.translate("chart.chart.playtestOpponent"), keybind: [CONTROL, ENTER], onSelect: _chart_playtest_opponent }, { - label: TU.translate("charter.chart.playtestOpponentHere"), + label: TU.translate("chart.chart.playtestOpponentHere"), keybind: [CONTROL, SHIFT, ENTER], onSelect: _chart_playtest_opponent_here }, null, { - label: TU.translate("charter.chart.enableScripts"), + label: TU.translate("chart.chart.enableScripts"), onSelect: _chart_enablescripts, icon: Options.charterEnablePlaytestScripts ? 1 : 0 }, null, { - label: TU.translate("charter.chart.editChartData"), + label: TU.translate("chart.chart.editChartData"), color: 0xFF959829, icon: 4, onCreate: function (button:UIContextMenuOptionSpr) {button.label.offset.x = button.icon.offset.x = -2;}, onSelect: chart_edit_data }, { - label: TU.translate("charter.chart.editMetadata"), + label: TU.translate("chart.chart.editMetadata"), color: 0xFF959829, icon: 4, onCreate: function (button:UIContextMenuOptionSpr) {button.label.offset.x = button.icon.offset.x = -2;}, onSelect: chart_edit_metadata @@ -259,105 +259,105 @@ class Charter extends UIState { ] }, { - label: TU.translate("charter.topBar.view"), + label: TU.translate("chart.topBar.view"), childs: [ { - label: TU.translate("charter.view.zoomIn"), + label: TU.translate("chart.view.zoomIn"), keybind: [CONTROL, NUMPADPLUS], onSelect: _view_zoomin }, { - label: TU.translate("charter.view.zoomOut"), + label: TU.translate("chart.view.zoomOut"), keybind: [CONTROL, NUMPADMINUS], onSelect: _view_zoomout }, { - label: TU.translate("charter.view.resetZoom"), + label: TU.translate("chart.view.resetZoom"), keybind: [CONTROL, NUMPADZERO], onSelect: _view_zoomreset }, null, { - label: TU.translate("charter.view.showSectionsSeparator"), + label: TU.translate("chart.view.showSectionsSeparator"), onSelect: _view_showeventSecSeparator, icon: Options.charterShowSections ? 1 : 0 }, { - label: TU.translate("charter.view.showBeatsSeparator"), + label: TU.translate("chart.view.showBeatsSeparator"), onSelect: _view_showeventBeatSeparator, icon: Options.charterShowBeats ? 1 : 0 }, null, { - label: TU.translate("charter.view.lowDetailWaveforms"), + label: TU.translate("chart.view.lowDetailWaveforms"), onSelect: _view_switchWaveformDetail, icon: Options.charterLowDetailWaveforms ? 1 : 0 } ] }, { - label: TU.translate("charter.topBar.song"), + label: TU.translate("chart.topBar.song"), childs: [ { - label: TU.translate("charter.song.goStart"), + label: TU.translate("chart.song.goStart"), keybind: [HOME], onSelect: _song_start }, { - label: TU.translate("charter.song.goEnd"), + label: TU.translate("chart.song.goEnd"), keybind: [END], onSelect: _song_end }, null, { - label: TU.translate("charter.song.muteInst"), + label: TU.translate("chart.song.muteInst"), onSelect: _song_muteinst }, { - label: TU.translate("charter.song.muteVoices"), + label: TU.translate("chart.song.muteVoices"), onSelect: _song_mutevoices } ] }, { - label: TU.translate("charter.topBar.note") + " >", + label: TU.translate("chart.topBar.note") + " >", childs: buildNoteTypesUI() }, { - label: TU.translate("charter.topBar.snap") + " >", + label: TU.translate("chart.topBar.snap") + " >", childs: buildSnapsUI() }, { - label: TU.translate("charter.topBar.playback") + " >", + label: TU.translate("chart.topBar.playback") + " >", childs: [ { - label: TU.translate("charter.playback.play"), + label: TU.translate("chart.playback.play"), keybind: [SPACE], onSelect: _playback_play }, null, { - label: TU.translate("charter.playback.speedRaise", ["25"]), + label: TU.translate("chart.playback.speedRaise", ["25"]), keybind: [PERIOD], onSelect: _playback_speed_raise }, { - label: TU.translate("charter.playback.speedReset"), + label: TU.translate("chart.playback.speedReset"), onSelect: _playback_speed_reset }, { - label: TU.translate("charter.playback.speedLower", ["25"]), + label: TU.translate("chart.playback.speedLower", ["25"]), keybind: [COMMA], onSelect: _playback_speed_lower }, null, { - label: TU.translate("charter.playback.sectionBack"), + label: TU.translate("chart.playback.sectionBack"), keybind: [A], onSelect: _playback_back }, { - label: TU.translate("charter.playback.sectionForward"), + label: TU.translate("chart.playback.sectionForward"), keybind: [D], onSelect: _playback_forward }, @@ -379,12 +379,12 @@ class Charter extends UIState { }, null, { - label: TU.translate("charter.playback.metronome"), + label: TU.translate("chart.playback.metronome"), onSelect: _playback_metronome, icon: Options.charterMetronomeEnabled ? 1 : 0 }, { - label: TU.translate("charter.playback.visualMetronome") + label: TU.translate("chart.playback.visualMetronome") }, ] } @@ -430,7 +430,7 @@ class Charter extends UIState { topMenuSpr = new UITopMenu(topMenu); topMenuSpr.cameras = uiGroup.cameras = [uiCamera]; - noteTypeText = new UIText(0, 0, 0, "(0) " + TU.translate("charter.noteTypes.default")); + noteTypeText = new UIText(0, 0, 0, "(0) " + TU.translate("chart.noteTypes.default")); noteTypeText.cameras = [uiCamera]; scrollBar = new UIScrollBar(FlxG.width - 20, topMenuSpr.bHeight, 1000, 0, 100); @@ -468,12 +468,12 @@ class Charter extends UIState { autoSaveNotif = new CharterAutoSaveUI(20, strumlineInfoBG.y + strumlineInfoBG.height + 20); uiGroup.add(autoSaveNotif); - strumlineAddButton = new CharterStrumlineButton("editors/new", TU.translate("charter.createNew")); + strumlineAddButton = new CharterStrumlineButton("editors/new", TU.translate("chart.createNew")); strumlineAddButton.onClick = createStrumWithUI; strumlineAddButton.animationOnClick = false; strumlineAddButton.textColorLerp = 0.5; - strumlineLockButton = new CharterStrumlineButton("editors/charter/lock-strumline", TU.translate("charter.lock-unlock")); + strumlineLockButton = new CharterStrumlineButton("editors/charter/lock-strumline", TU.translate("chart.lock-unlock")); strumlineLockButton.onClick = function () { if (strumLines != null) { strumLines.draggable = !strumLines.draggable; @@ -724,7 +724,7 @@ class Charter extends UIState { __autoSaveLocation = __diff.toLowerCase() + DateTools.format(Date.now(), "%m-%d_%H-%M"); var filename = !Options.charterAutoSavesSeparateFolder ? '${__diff.toLowerCase()}.json' : '${__autoSaveLocation}.json'; autoSaveNotif.startAutoSave(autoSaveTimer, - TU.translate("charter.popup.savedChartAt", [filename]) + TU.translate("chart.popup.savedChartAt", [filename]) ); } if (autoSaveTimer <= 0) { @@ -1218,7 +1218,7 @@ class Charter extends UIState { noteTypeText.x = noteTopButton.x + noteTopButton.bWidth + 6; noteTypeText.y = Std.int((noteTopButton.bHeight - noteTypeText.height) / 2); } - noteTypeText.text = '($noteType) ' + (noteTypes[noteType-1] == null ? TU.translate("charter.noteTypes.default") : noteTypes[noteType-1]); + noteTypeText.text = '($noteType) ' + (noteTypes[noteType-1] == null ? TU.translate("chart.noteTypes.default") : noteTypes[noteType-1]); super.update(elapsed); @@ -1665,16 +1665,16 @@ class Charter extends UIState { var snapsTopButton:UITopMenuButton = topMenuSpr == null ? null : cast topMenuSpr.members[snapIndex]; var newChilds:Array = [ { - label: TU.translate("charter.snap.increaseSnap"), + label: TU.translate("chart.snap.increaseSnap"), keybind: [X], onSelect: _snap_increasesnap }, { - label: TU.translate("charter.snap.resetSnap"), + label: TU.translate("chart.snap.resetSnap"), onSelect: _snap_resetsnap }, { - label: TU.translate("charter.snap.decreaseSnap"), + label: TU.translate("chart.snap.decreaseSnap"), keybind: [Z], onSelect: _snap_decreasesnap }, @@ -1753,29 +1753,29 @@ class Charter extends UIState { var noteTopButton:UITopMenuButton = topMenuSpr == null ? null : cast topMenuSpr.members[noteIndex]; var newChilds:Array = [ { - label: TU.translate("charter.note.addSustainLength"), + label: TU.translate("chart.note.addSustainLength"), keybind: [E], onSelect: _note_addsustain }, { - label: TU.translate("charter.note.subtractSustainLength"), + label: TU.translate("chart.note.subtractSustainLength"), keybind: [Q], onSelect: _note_subtractsustain }, null, { - label: TU.translate("charter.note.selectAll"), + label: TU.translate("chart.note.selectAll"), keybind: [CONTROL, A], onSelect: _note_selectall }, { - label: TU.translate("charter.note.selectMeasure"), + label: TU.translate("chart.note.selectMeasure"), keybind: [CONTROL, SHIFT, A], onSelect: _note_selectmeasure }, null, { - label: "(0) " + TU.translate("charter.noteTypes.default"), + label: "(0) " + TU.translate("chart.noteTypes.default"), keybind: [ZERO], onSelect: (_) -> {changeNoteType(0);}, icon: this.noteType == 0 ? 1 : 0 @@ -1795,7 +1795,7 @@ class Charter extends UIState { newChilds.push(newChild); } newChilds.push({ - label: TU.translate("charter.note.editNoteTypesList"), + label: TU.translate("chart.note.editNoteTypesList"), color: 0xFF959829, icon: 4, onCreate: function (button:UIContextMenuOptionSpr) {button.label.offset.x = button.icon.offset.x = -2;}, onSelect: editNoteTypesList diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx index 405ae52d..346f02c0 100644 --- a/source/funkin/editors/charter/CharterSelection.hx +++ b/source/funkin/editors/charter/CharterSelection.hx @@ -47,7 +47,7 @@ class CharterSelection extends EditorTreeMenu { FlxG.state.openSubState(new SongCreationScreen(saveSong)); })); - main = new OptionsScreen(TU.translate("charter.name"), TU.translate("charterSelection.desc"), list); + main = new OptionsScreen(TU.translate("editor.chart.name"), TU.translate("charterSelection.desc"), list); DiscordUtil.call("onEditorTreeLoaded", ["Chart Editor"]); }