From 521cef3a227a4c6d9aba90d8c048a80bd943f24e Mon Sep 17 00:00:00 2001 From: flb Date: Sun, 14 Mar 2021 23:13:49 +0100 Subject: [PATCH] Added possibility to chose system's default --- include/constants.hpp | 2 +- resources/i18n/en-US/menus.json | 3 ++- source/reboot_payload.c | 9 --------- source/tools_tab.cpp | 7 +++++++ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/constants.hpp b/include/constants.hpp index afcc157..156373a 100644 --- a/include/constants.hpp +++ b/include/constants.hpp @@ -60,7 +60,7 @@ #define PC_COLOR_PATH "/config/aio-switch-updater/pc_profiles.json" #define PAYLOAD_PATH "/payloads/" -#define BOOTLOADER_PATH "/bootloader" +#define BOOTLOADER_PATH "/bootloader/" #define BOOTLOADER_PL_PATH "/bootloader/payloads/" #define UPDATE_BIN_PATH "/bootloader/update.bin" #define REBOOT_PAYLOAD_PATH "/atmosphere/reboot_payload.bin" diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json index 5715258..959bad8 100644 --- a/resources/i18n/en-US/menus.json +++ b/resources/i18n/en-US/menus.json @@ -157,12 +157,13 @@ "title": "Internet settings" }, "language": { + "system_default": "System default", "en-US": "American English (en-US)", "ja": "Japanese (ja)", "fr": "French (fr)", "de": "German (de)", "it": "Italian (it)", - "es": "Spanish", + "es": "Spanish (es)", "zh-CN": "Simplified Chinese (zh-CN)", "ko": "Korean (ko)", "nl": "Dutch (nl)", diff --git a/source/reboot_payload.c b/source/reboot_payload.c index 4aeff4c..a3a59df 100644 --- a/source/reboot_payload.c +++ b/source/reboot_payload.c @@ -50,15 +50,6 @@ static void inject_payload(void) { int reboot_to_payload(const char* path){ bool can_reboot = true; - //Result rc = splInitialize(); - /* if(0){ - //if (R_FAILED(rc)) { - can_reboot = false; - printf("Can't reboot"); - } */ - const char* lol = "lol"; - printf(lol); - printf(path); FILE *f; f = fopen(path, "rb"); if (f == NULL) can_reboot = false; diff --git a/source/tools_tab.cpp b/source/tools_tab.cpp index 6a7c901..c33ea3c 100644 --- a/source/tools_tab.cpp +++ b/source/tools_tab.cpp @@ -218,6 +218,13 @@ ToolsTab::ToolsTab(std::string tag, bool erista) : brls::List() brls::AppletFrame* appView = new brls::AppletFrame(true, true); brls::List* list = new brls::List(); brls::ListItem* listItem; + listItem = new brls::ListItem(fmt::format("{} ({})", "menus/language/system_default"_i18n, i18n::getCurrentLocale())); + listItem->registerAction("menus/tools/language"_i18n, brls::Key::A, [this] { + std::filesystem::remove(LANGUAGE_JSON); + brls::Application::quit(); + return true; + }); + list->addView(listItem); for(auto& l : languages){ listItem = new brls::ListItem(l.first); listItem->registerAction("menus/tools/language"_i18n, brls::Key::A, [this, l] {