From af210d2f65bb2397a1478e53537ac05dcd920c2b Mon Sep 17 00:00:00 2001 From: damien zhao Date: Sun, 5 Sep 2021 11:11:26 +0800 Subject: [PATCH] full UI with translation --- romfs/lang/en-US.txt | 28 ++++++++++++++-------------- romfs/lang/zh-CN.txt | 30 +++++++++++++++--------------- romfs/lang/zh-TW.txt | 28 ++++++++++++++-------------- src/data.cpp | 22 ++++++---------------- src/ui.cpp | 8 ++++++-- src/ui/usr.cpp | 14 +++++++------- src/util.cpp | 16 ++++++++-------- 7 files changed, 70 insertions(+), 76 deletions(-) diff --git a/romfs/lang/en-US.txt b/romfs/lang/en-US.txt index e175c2a..3d55e98 100644 --- a/romfs/lang/en-US.txt +++ b/romfs/lang/en-US.txt @@ -7,25 +7,25 @@ #It can also export already made translations with new strings if added, cutting down work for everyone. #If there are issues with spacing, line breaking, untranslatable English text, etc let me know in a git issue or your pull request. -usersSaveType = 0, "Device" -usersSaveType = 1, "BCAT" -usersSaveType = 2, "Cache" -usersSaveType = 3, "System" -usersSaveType = 4, "System BCAT" -usersSaveType = 5, "SysTemp Storagetem" +saveTypeMainMenu = 0, "Device" +saveTypeMainMenu = 1, "BCAT" +saveTypeMainMenu = 2, "Cache" +saveTypeMainMenu = 3, "System" +saveTypeMainMenu = 4, "System BCAT" +saveTypeMainMenu = 5, "SysTemp Storagetem" settingsMainMenu = 0, "Settings" extrasMainMenu = 0, "Extras" translationMainPage = 0, "Translation: " loadingStartPage = 0, "Loading..." -saveDataType = 0, "System Save\n" -saveDataType = 1, "Save Data\n" -saveDataType = 2, "BCAT\n" -saveDataType = 3, "Device Save\n" -saveDataType = 4, "Temp Storage\n" -saveDataType = 5, "Cache Storage\n" -saveDataType = 6, "System BCAT\n" -saveDataType = 7, "Save Index: " +saveDataTypeText = 0, "System Save\n" +saveDataTypeText = 1, "Save Data\n" +saveDataTypeText = 2, "BCAT\n" +saveDataTypeText = 3, "Device Save\n" +saveDataTypeText = 4, "Temp Storage\n" +saveDataTypeText = 5, "Cache Storage\n" +saveDataTypeText = 6, "System BCAT\n" +saveDataIndexText = 0, "Save Index: " infoStatus = 0, "TID: " infoStatus = 1, "SID: " diff --git a/romfs/lang/zh-CN.txt b/romfs/lang/zh-CN.txt index 17c021c..1f9455a 100644 --- a/romfs/lang/zh-CN.txt +++ b/romfs/lang/zh-CN.txt @@ -1,4 +1,4 @@ -#JKSV 中文简体翻译文件 +#JKSV 简体中文翻译文件 #文件可以放置并命名为“/JKSV/trans.txt”，用于测试而无需编译 #格式为: 字符串名称 = 字符串索引号, "字符串文本" #您只需翻译“字符串文本”，无需触摸其他两个参数。 @@ -7,25 +7,25 @@ #如果添加了新字符串，它还可以导出已经生成的翻译，从而减少每个人的工作量。 #如果存在空格、换行或无法翻译的英文文本等问题，请在git问题或您的pull请求中告诉我。 -usersSaveType = 0, "设备存档" -usersSaveType = 1, "BCAT存档" -usersSaveType = 2, "缓存存档" -usersSaveType = 3, "系统存档" -usersSaveType = 4, "系统BCAT存档" -usersSaveType = 5, "临时存档" +saveTypeMainMenu = 0, "设备" +saveTypeMainMenu = 1, "BCAT" +saveTypeMainMenu = 2, "缓存" +saveTypeMainMenu = 3, "系统" +saveTypeMainMenu = 4, "系统BCAT" +saveTypeMainMenu = 5, "临时" settingsMainMenu = 0, "系统设置" extrasMainMenu = 0, "附加设置" translationMainPage = 0, "翻译：" loadingStartPage = 0, "加载中..." -saveDataType = 0, "系统存档\n" -saveDataType = 1, "用户存档\n" -saveDataType = 2, "BCAT存档\n" -saveDataType = 3, "设备存档\n" -saveDataType = 4, "临时存档\n" -saveDataType = 5, "缓存存档\n" -saveDataType = 6, "系统BCAT存档\n" -saveDataType = 7, "存档索引号：" +saveDataTypeText = 0, "系统存档\n" +saveDataTypeText = 1, "用户存档\n" +saveDataTypeText = 2, "BCAT存档\n" +saveDataTypeText = 3, "设备存档\n" +saveDataTypeText = 4, "临时存档\n" +saveDataTypeText = 5, "缓存存档\n" +saveDataTypeText = 6, "系统BCAT存档\n" +saveDataIndexText = 0, "存档索引号：" infoStatus = 0, "TID: " infoStatus = 1, "SID: " diff --git a/romfs/lang/zh-TW.txt b/romfs/lang/zh-TW.txt index 6f6e0bb..8568086 100644 --- a/romfs/lang/zh-TW.txt +++ b/romfs/lang/zh-TW.txt @@ -7,25 +7,25 @@ #It can also export already made translations with new strings if added, cutting down work for everyone. #If there are issues with spacing, line breaking, untranslatable English text, etc let me know in a git issue or your pull request. -usersSaveType = 0, "設備存檔" -usersSaveType = 1, "BCAT存檔" -usersSaveType = 2, "緩存存檔" -usersSaveType = 3, "系統存檔" -usersSaveType = 4, "系統BCAT存檔" -usersSaveType = 5, "臨時存檔" +saveTypeMainMenu = 0, "設備" +saveTypeMainMenu = 1, "BCAT" +saveTypeMainMenu = 2, "緩存" +saveTypeMainMenu = 3, "系統" +saveTypeMainMenu = 4, "系統BCAT" +saveTypeMainMenu = 5, "臨時" settingsMainMenu = 0, "系統設置" extrasMainMenu = 0, "附加設定" translationMainPage = 0, "翻譯：" loadingStartPage = 0, "加載中…" -saveDataType = 0, "系統存檔\n" -saveDataType = 1, "用戶存檔\n" -saveDataType = 2, "BCAT存檔\n" -saveDataType = 3, "設備存檔\n" -saveDataType = 4, "臨時存檔\n" -saveDataType = 5, "緩存存檔\n" -saveDataType = 6, "系統BCAT存檔\n" -saveDataType = 7, "存檔索引號：" +saveDataTypeText = 0, "系統存檔\n" +saveDataTypeText = 1, "用戶存檔\n" +saveDataTypeText = 2, "BCAT存檔\n" +saveDataTypeText = 3, "設備存檔\n" +saveDataTypeText = 4, "臨時存檔\n" +saveDataTypeText = 5, "緩存存檔\n" +saveDataTypeText = 6, "系統BCAT存檔\n" +saveDataIndexText = 0, "存檔索引號：" infoStatus = 0, "TID:" infoStatus = 1, "SID:" diff --git a/src/data.cpp b/src/data.cpp index b1e92d2..63c22ac 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -200,14 +200,10 @@ bool data::loadUsersTitles(bool clearUsers) loadUserAccounts(); sysBCATPushed = false; tempPushed = false; - //users.emplace_back(util::u128ToAccountUID(3), ui::getUICString("usersSaveType", 0)); - //users.emplace_back(util::u128ToAccountUID(2), ui::getUICString("usersSaveType", 1)); - //users.emplace_back(util::u128ToAccountUID(5), ui::getUICString("usersSaveType", 2)); - //users.emplace_back(util::u128ToAccountUID(0), ui::getUICString("usersSaveType", 3)); - users.emplace_back(util::u128ToAccountUID(3), "设备"); - users.emplace_back(util::u128ToAccountUID(2), "BCAT"); - users.emplace_back(util::u128ToAccountUID(5), "缓存"); - users.emplace_back(util::u128ToAccountUID(0), "系统"); + users.emplace_back(util::u128ToAccountUID(3), ui::getUIString("saveTypeMainMenu", 0)); + users.emplace_back(util::u128ToAccountUID(2), ui::getUIString("saveTypeMainMenu", 1)); + users.emplace_back(util::u128ToAccountUID(5), ui::getUIString("saveTypeMainMenu", 2)); + users.emplace_back(util::u128ToAccountUID(0), ui::getUIString("saveTypeMainMenu", 3)); } for(unsigned i = 0; i < 7; i++) @@ -246,8 +242,7 @@ bool data::loadUsersTitles(bool clearUsers) { ++systemUserCount; sysBCATPushed = true; - //users.emplace_back(util::u128ToAccountUID(4), ui::getUICString("usersSaveType", 4)); - users.emplace_back(util::u128ToAccountUID(4), "系统BCAT"); + users.emplace_back(util::u128ToAccountUID(4), ui::getUIString("saveTypeMainMenu", 4)); } break; @@ -261,8 +256,7 @@ bool data::loadUsersTitles(bool clearUsers) { ++systemUserCount; tempPushed = true; - //users.emplace_back(util::u128ToAccountUID(6), ui::getUICString("usersSaveType", 5)); - users.emplace_back(util::u128ToAccountUID(6), "临时"); + users.emplace_back(util::u128ToAccountUID(6), ui::getUIString("saveTypeMainMenu", 5)); } break; } @@ -314,10 +308,6 @@ void data::init() if(cfg::config["ovrClk"]) util::setCPU(util::CPU_SPEED_1224MHz); - uint64_t lang; - setGetSystemLanguage(&lang); - setMakeLanguage(lang, &sysLang); - data::loadUsersTitles(true); } diff --git a/src/ui.cpp b/src/ui.cpp index f3bb0aa..25b4298 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -63,6 +63,12 @@ const std::string ui::loadGlyphArray[] = void ui::initTheme() { + uint64_t lang; + setGetSystemLanguage(&lang); + setMakeLanguage(lang, &data::sysLang); + + loadTrans(); + setsysGetColorSetId(&thmID); switch(thmID) @@ -131,8 +137,6 @@ void ui::init() break; } - loadTrans(); - //Replace the button [x] in strings that need it. Needs to be outside loadTrans so even defaults will get replaced util::replaceButtonsInString(ui::strings[std::make_pair("helpUser", 0)]); util::replaceButtonsInString(ui::strings[std::make_pair("helpTitle", 0)]); diff --git a/src/ui/usr.cpp b/src/ui/usr.cpp index f6096c5..b58c08e 100644 --- a/src/ui/usr.cpp +++ b/src/ui/usr.cpp @@ -119,9 +119,9 @@ static void saveCreateCallback(void *a) static void usrOptSaveCreate(void *a) { ui::menu *m = (ui::menu *)a; - int devPos = m->getOptPos(ui::getUICString("usersSaveType", 0)); - int bcatPos = m->getOptPos(ui::getUICString("usersSaveType", 1)); - int cachePos = m->getOptPos(ui::getUICString("usersSaveType", 2)); + int devPos = m->getOptPos(ui::getUICString("saveTypeMainMenu", 0)); + int bcatPos = m->getOptPos(ui::getUICString("saveTypeMainMenu", 1)); + int cachePos = m->getOptPos(ui::getUICString("saveTypeMainMenu", 2)); ui::updateInput(); int sel = m->getSelected(); @@ -164,7 +164,7 @@ static void usrOptDeleteAllUserSaves_t(void *a) threadInfo *t = (threadInfo *)a; data::user *u = data::getCurrentUser(); int curUserIndex = data::getCurrentUserIndex(); - int devUser = ui::usrMenu->getOptPos(ui::getUICString("usersSaveType", 0)); + int devUser = ui::usrMenu->getOptPos(ui::getUICString("saveTypeMainMenu", 0)); for(data::userTitleInfo& tinf : u->titleInfo) { @@ -261,8 +261,8 @@ static void usrOptCreateAllSaves_t(void *a) { threadInfo *t = (threadInfo *)a; data::user *u = data::getCurrentUser(); - int devPos = ui::usrMenu->getOptPos(ui::getUICString("usersSaveType", 0)); - int bcatPos = ui::usrMenu->getOptPos(ui::getUICString("usersSaveType", 1)); + int devPos = ui::usrMenu->getOptPos(ui::getUICString("saveTypeMainMenu", 0)); + int bcatPos = ui::usrMenu->getOptPos(ui::getUICString("saveTypeMainMenu", 1)); int sel = ui::usrMenu->getSelected(); if(sel < devPos) { @@ -464,7 +464,7 @@ void ui::usrUpdate() { case HidNpadButton_X: { - int cachePos = usrMenu->getOptPos(ui::getUIString("usersSaveType", 2)); + int cachePos = usrMenu->getOptPos(ui::getUIString("saveTypeMainMenu", 2)); if(usrMenu->getSelected() <= cachePos) { data::user *u = data::getCurrentUser(); diff --git a/src/util.cpp b/src/util.cpp index deca03b..d23a9ca 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -216,35 +216,35 @@ std::string util::getInfoString(data::user& u, const uint64_t& tid) switch(userTinfo->saveInfo.save_data_type) { case FsSaveDataType_System: - ret += ui::getUICString("saveDataType", 0); + ret += ui::getUICString("saveDataTypeText", 0); break; case FsSaveDataType_Account: - ret += ui::getUICString("saveDataType", 1); + ret += ui::getUICString("saveDataTypeText", 1); break; case FsSaveDataType_Bcat: - ret += ui::getUICString("saveDataType", 2); + ret += ui::getUICString("saveDataTypeText", 2); break; case FsSaveDataType_Device: - ret += ui::getUICString("saveDataType", 3); + ret += ui::getUICString("saveDataTypeText", 3); break; case FsSaveDataType_Temporary: - ret += ui::getUICString("saveDataType", 4); + ret += ui::getUICString("saveDataTypeText", 4); break; case FsSaveDataType_Cache: { data::userTitleInfo *d = data::getCurrentUserTitleInfo(); - ret += ui::getUICString("saveDataType", 5); - ret += ui::getUICString("saveDataType", 7) + std::to_string(d->saveInfo.save_data_index) + "\n"; + ret += ui::getUICString("saveDataTypeText", 5); + ret += ui::getUICString("saveDataIndexText", 0) + std::to_string(d->saveInfo.save_data_index) + "\n"; } break; case FsSaveDataType_SystemBcat: - ret += ui::getUICString("saveDataType", 6); + ret += ui::getUICString("saveDataTypeText", 6); break; }