diff --git a/assets/languages/en/config.ini b/assets/languages/en/config.ini index 2aa42bba..b020d221 100644 --- a/assets/languages/en/config.ini +++ b/assets/languages/en/config.ini @@ -1,6 +1,6 @@ name="English" -credits="Codename Engine Devs" -version="0.0.1" +credits="Codename Crew" +version="1.0.0" ; Moving these in the wiki when releasing ; Shows missing ID:s as {id} and prints in the console Missing Translation IDs: id diff --git a/assets/languages/it/config.ini b/assets/languages/it/config.ini index cd9e30b5..15396e03 100644 --- a/assets/languages/it/config.ini +++ b/assets/languages/it/config.ini @@ -1,6 +1,6 @@ name="Italiano" credits="Nex_isDumb" -version="0.0.1" +version="1.0.0" ; Moving these in the wiki when releasing ; Shows missing ID:s as {id} and prints in the console Missing Translation IDs: id diff --git a/source/funkin/backend/utils/TranslationUtil.hx b/source/funkin/backend/utils/TranslationUtil.hx index 6526096c..185d306a 100644 --- a/source/funkin/backend/utils/TranslationUtil.hx +++ b/source/funkin/backend/utils/TranslationUtil.hx @@ -201,8 +201,9 @@ final class TranslationUtil if(Assets.exists(path)) { var c = IniUtil.parseAsset(path); - for (key => value in c) - config[key] = value; + for (i => v in c) + for (key => value in v) + config[key] = value; } else { // if there was no config.ini, use the file name as the language name for(file in Paths.getFolderContent(mainPath + lang).sortAlphabetically()) { if(Path.extension(file) == "xml") { diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index 283706b3..ceab76ed 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -37,22 +37,26 @@ class KeybindsOptions extends MusicBeatSubstate { name: translate("category.notes"), settings: [ { - icon: ["game/notes/default", "purple0"], + sparrowIcon: "game/notes/default", + sparrowAnim: "purple0", name: translate("left"), control: 'NOTE_LEFT' }, { - icon: ['game/notes/default', 'blue0'], + sparrowIcon: "game/notes/default", + sparrowAnim: "blue0", name: translate("down"), control: 'NOTE_DOWN' }, { - icon: ['game/notes/default', 'green0'], + sparrowIcon: "game/notes/default", + sparrowAnim: "green0", name: translate("up"), control: 'NOTE_UP' }, { - icon: ['game/notes/default', 'red0'], + sparrowIcon: "game/notes/default", + sparrowAnim: "red0", name: translate("right"), control: 'NOTE_RIGHT' }, @@ -188,10 +192,6 @@ class KeybindsOptions extends MusicBeatSubstate { for(e in category.settings) { var sparrowIcon:String = null; var sparrowAnim:String = null; - if(e.icon != null) { - sparrowIcon = e.icon[0]; - sparrowAnim = e.icon[1]; - } if (e.sparrowIcon != null) sparrowIcon = e.sparrowIcon; if (e.sparrowAnim != null) sparrowAnim = e.sparrowAnim;