From 314bd06407196aa4c67871d9f480136d945e8118 Mon Sep 17 00:00:00 2001 From: flb Date: Tue, 9 Feb 2021 15:10:12 +0100 Subject: [PATCH] turns out some people don't know systems are patched upon, and not on the fly --- Makefile | 4 ++-- resources/i18n/en-US/custom_layout.json | 5 ----- resources/i18n/en-US/menus.json | 2 ++ resources/i18n/fr/custom_layout.json | 5 ----- source/changelog_page.cpp | 5 ++++- source/list_download_tab.cpp | 6 +++++- 6 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 resources/i18n/en-US/custom_layout.json delete mode 100644 resources/i18n/fr/custom_layout.json diff --git a/Makefile b/Makefile index d8a2332..d8ce4ef 100644 --- a/Makefile +++ b/Makefile @@ -160,10 +160,10 @@ all: $(BUILD) $(ROMFS): @[ -d $@ ] || mkdir -p $@ @echo Merging ROMFS... - @cp -ruf $(CURDIR)/$(BOREALIS_PATH)/resources/. $(CURDIR)/$(ROMFS)/ + @cp -ruf $(CURDIR)/$(BOREALIS_PATH)/resources/i18n/. $(CURDIR)/$(ROMFS)/i18n/ @cp -ruf $(CURDIR)/$(ROMFS)/i18n/zh-CN/. $(CURDIR)/$(ROMFS)/i18n/zh-Hans/ @cp -ruf $(CURDIR)/$(ROMFS)/i18n/zh-TW/. $(CURDIR)/$(ROMFS)/i18n/zh-Hant/ - @rm $(CURDIR)/$(ROMFS)/i18n/*/installer.json $(CURDIR)/$(ROMFS)/i18n/*/main.json $(CURDIR)/$(ROMFS)/i18n/*/popup.json + @rm $(CURDIR)/$(ROMFS)/i18n/*/installer.json $(CURDIR)/$(ROMFS)/i18n/*/main.json $(CURDIR)/$(ROMFS)/i18n/*/popup.json $(CURDIR)/$(ROMFS)/i18n/*/custom_layout.json @$(MAKE) -C $(CURDIR)/rcm -f $(CURDIR)/rcm/Makefile @cp $(CURDIR)/rcm/output/aio_rcm.bin $(CURDIR)/$(ROMFS)/aio_rcm.bin #@$(MAKE) -C $(CURDIR)/aiosu-forwarder -f $(CURDIR)/aiosu-forwarder/Makefile diff --git a/resources/i18n/en-US/custom_layout.json b/resources/i18n/en-US/custom_layout.json deleted file mode 100644 index 86a6ba3..0000000 --- a/resources/i18n/en-US/custom_layout.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "first_button": "First button", - "second_button": "Second button", - "third_button": "Third button" -} diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json index e0eb11b..b11acab 100644 --- a/resources/i18n/en-US/menus.json +++ b/resources/i18n/en-US/menus.json @@ -69,6 +69,7 @@ "v2_0_1_text": "\uE016 Fixed a bug not letting the user click no when asked if they want to install hekate.n\uE016 Correct a bunch of typos.", "v2_1_0": "v2.1.0", "v2_1_0_text": "\uE016 Switched to a better way to get links.", + "v2_1_1_text": "\uE016 Added a friendly reminder to reboot for new sigpatches to apply", "Ok_button": "Ok", "cheats_page.cpp":"", @@ -79,6 +80,7 @@ "cheat_delete_all_cheat": "Delete all cheats", "cheat_Deleting": "Deleting...", "cheat_All_done": "All done!", + "please_reboot": "The changes will take effect at the next reboot.", "cheastlips_title": "Cheatslips cheats", "get_cheatslips": "Download CheatSlips.com cheat sheets", diff --git a/resources/i18n/fr/custom_layout.json b/resources/i18n/fr/custom_layout.json deleted file mode 100644 index 9f29306..0000000 --- a/resources/i18n/fr/custom_layout.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "first_button": "Premier bouton", - "second_button": "Deuxième bouton", - "third_button": "Troisième bouton" -} diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp index 0679674..e8e2192 100644 --- a/source/changelog_page.cpp +++ b/source/changelog_page.cpp @@ -85,9 +85,12 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) verTitles.push_back("menus/v2_0_1"_i18n ); changes.push_back("menus/v2_0_1_text"_i18n ); - verTitles.push_back("2.1.0"); + verTitles.push_back("v2.1.0"); changes.push_back("menus/v2_1_0_text"_i18n ); + verTitles.push_back("v2.1.1"); + changes.push_back("menus/v2_1_1_text"_i18n ); + int nbVersions = verTitles.size(); items.reserve(nbVersions); for(int i = nbVersions -1 ; i >= 0; i--){ diff --git a/source/list_download_tab.cpp b/source/list_download_tab.cpp index 0802a2b..d7aceae 100644 --- a/source/list_download_tab.cpp +++ b/source/list_download_tab.cpp @@ -87,7 +87,11 @@ ListDownloadTab::ListDownloadTab(archiveType type) : new WorkerPage(stagedFrame, "menus/list_extracting"_i18n , [type](){extractArchive(type);}) ); stagedFrame->addStage( - new ConfirmPage(stagedFrame, "menus/list_All"_i18n , true) + new ConfirmPage(stagedFrame, + (type == sigpatches) ? + "menus/list_All"_i18n + "\n" + "menus/please_reboot"_i18n : + "menus/list_All"_i18n, + true) ); brls::Application::pushView(stagedFrame); });