DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-05 08:39:05 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update Language Screen for Bruh and Русский.

Browse Source
This commit is contained in:
VoltZ
2019-11-08 01:30:46 +01:00
parent 1715b957a8
commit 4024901a6b
3 changed files with 138 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/screens/settings.hpp
+10 -9
View File
@@ -45,15 +45,16 @@ private:
void colorChanging(u32 hDown, touchPosition touch); void colorChanging(u32 hDown, touchPosition touch);
std::vector<Structs::ButtonPos> langBlocks = { std::vector<Structs::ButtonPos> langBlocks = {
{37, 52, 20, 20, -1}, {37, 32, 20, 20, -1},
{37, 92, 20, 20, -1}, {37, 72, 20, 20, -1},
{37, 132, 20, 20, -1}, {37, 112, 20, 20, -1},
{37, 172, 20, 20, -1}, {37, 152, 20, 20, -1},
{177, 52, 20, 20, -1}, {37, 188, 20, 20, -1},
{177, 92, 20, 20, -1}, {177, 32, 20, 20, -1},
{177, 132, 20, 20, -1}, {177, 72, 20, 20, -1},
{177, 172, 20, 20, -1}, {177, 112, 20, 20, -1},
{293, 213, 27, 27, -1}, {177, 152, 20, 20, -1},
{177, 188, 20, 20, -1},
}; };
std::vector<Structs::ButtonPos> buttons = { std::vector<Structs::ButtonPos> buttons = {
source/lang/lang.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ std::string Lang::get(const std::string &key) {
return appJson.at(key).get_ref<const std::string&>(); return appJson.at(key).get_ref<const std::string&>();
} }
std::string langs[] = {"de", "en", "es", "fr", "it", "jp", "lt", "pt"}; std::string langs[] = {"br", "de", "en", "es", "fr", "it", "jp", "lt", "pt", "ru"};
void Lang::load(int lang) { void Lang::load(int lang) {
FILE* values; FILE* values;
source/screens/settings.cpp
+127 -74
View File
@@ -49,103 +49,145 @@ void Settings::DrawLanguageSelection(void) const {
Gui::DrawBottom(); Gui::DrawBottom();
if (Config::lang == 0) { if (Config::lang == 0) {
Gui::Draw_Rect(37, 52, 20, 20, Config::SelectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 1) { } else if (Config::lang == 1) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::SelectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 2) { } else if (Config::lang == 2) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::SelectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 3) { } else if (Config::lang == 3) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::SelectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 4) { } else if (Config::lang == 4) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::SelectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 5) { } else if (Config::lang == 5) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::SelectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 6) { } else if (Config::lang == 6) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::SelectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::SelectedColor);
} else if (Config::lang == 7) { } else if (Config::lang == 7) {
Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 72, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(177, 132, 20, 20, Config::SelectedColor); Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 8) {
Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 112, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} else if (Config::lang == 9) {
Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor);
Gui::Draw_Rect(177, 152, 20, 20, Config::SelectedColor);
Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor);
} }
Gui::DrawString(langBlocks[0].x+25, langBlocks[0].y-2, 0.7f, Config::TxtColor, "Deutsch", 320); Gui::DrawString(langBlocks[0].x+25, langBlocks[0].y, 0.7f, Config::TxtColor, "Bruh", 320);
Gui::DrawString(langBlocks[1].x+25, langBlocks[1].y-2, 0.7f, Config::TxtColor, "English", 320); Gui::DrawString(langBlocks[1].x+25, langBlocks[1].y, 0.7f, Config::TxtColor, "Deutsch", 320);
Gui::DrawString(langBlocks[2].x+25, langBlocks[2].y-2, 0.7f, Config::TxtColor, "Español", 320); Gui::DrawString(langBlocks[2].x+25, langBlocks[2].y, 0.7f, Config::TxtColor, "English", 320);
Gui::DrawString(langBlocks[3].x+25, langBlocks[3].y-2, 0.7f, Config::TxtColor, "Français", 320); Gui::DrawString(langBlocks[3].x+25, langBlocks[3].y, 0.7f, Config::TxtColor, "Español", 320);
Gui::DrawString(langBlocks[4].x+25, langBlocks[4].y, 0.7f, Config::TxtColor, "Français", 320);
Gui::DrawString(langBlocks[4].x+25, langBlocks[4].y-2, 0.7f, Config::TxtColor, "Italiano", 320); Gui::DrawString(langBlocks[5].x+25, langBlocks[5].y, 0.7f, Config::TxtColor, "Italiano", 320);
Gui::DrawString(langBlocks[5].x+25, langBlocks[5].y-2, 0.7f, Config::TxtColor, "Lietuvių", 320); Gui::DrawString(langBlocks[6].x+25, langBlocks[6].y, 0.7f, Config::TxtColor, "Lietuvių", 320);
Gui::DrawString(langBlocks[6].x+25, langBlocks[6].y-2, 0.7f, Config::TxtColor, "Português", 320); Gui::DrawString(langBlocks[7].x+25, langBlocks[7].y, 0.7f, Config::TxtColor, "Português", 320);
Gui::DrawString(langBlocks[7].x+25, langBlocks[7].y-2, 0.7f, Config::TxtColor, "日本語", 320); Gui::DrawString(langBlocks[8].x+25, langBlocks[8].y, 0.7f, Config::TxtColor, "Русский", 320);
Gui::DrawString(langBlocks[9].x+25, langBlocks[9].y, 0.7f, Config::TxtColor, "日本語", 320);
} }
void Settings::DrawColorChanging(void) const { void Settings::DrawColorChanging(void) const {
@@ -244,8 +286,10 @@ void Settings::LanguageSelection(u32 hDown, touchPosition touch) {
Lang::load(Config::lang); Lang::load(Config::lang);
Config::saveConfig(); Config::saveConfig();
} else if (touching(touch, langBlocks[5])) { } else if (touching(touch, langBlocks[5])) {
Config::lang = 6; Config::lang = 5;
Lang::load(Config::lang); Lang::load(Config::lang);
Config::saveConfig(); Config::saveConfig();
@@ -255,7 +299,16 @@ void Settings::LanguageSelection(u32 hDown, touchPosition touch) {
Config::saveConfig(); Config::saveConfig();
} else if (touching(touch, langBlocks[7])) { } else if (touching(touch, langBlocks[7])) {
Config::lang = 5; Config::lang = 8;
Lang::load(Config::lang);
Config::saveConfig();
} else if (touching(touch, langBlocks[8])) {
Config::lang = 9;
Lang::load(Config::lang);
Config::saveConfig();
} else if (touching(touch, langBlocks[9])) {
Config::lang = 6;
Lang::load(Config::lang); Lang::load(Config::lang);
Config::saveConfig(); Config::saveConfig();
} }