mirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2025-12-23 22:29:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert unnecessary locale changes and remove debug line.

Browse Source
This commit is contained in:
aristocratos
2025-08-11 14:45:26 +02:00
parent a05192fc4a
commit 4f5abbb3eb
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/btop.cpp
View File

@@ -898,7 +898,6 @@ int main(const int argc, const char** argv) {
//? Try to find and set a UTF-8 locale
if (std::setlocale(LC_ALL, "") != nullptr and not s_contains((string)std::setlocale(LC_ALL, ""), ";")
and str_to_upper(s_replace((string)std::setlocale(LC_ALL, ""), "-", "")).ends_with("UTF8")) {
std::locale::global(std::locale(std::setlocale(LC_ALL, "")));
Logger::debug("Using locale " + std::locale().name());
}
else {
@@ -921,7 +920,6 @@ int main(const int argc, const char** argv) {
if (str_to_upper(s_replace(l, "-", "")).ends_with("UTF8")) {
found = l.substr(l.find('=') + 1);
if (std::setlocale(LC_ALL, found.c_str()) != nullptr) {
std::locale::global(std::locale(found));
break;
}
}
@@ -943,11 +941,9 @@ int main(const int argc, const char** argv) {
Logger::warning("No UTF-8 locale detected! Some symbols might not display correctly.");
}
else if (std::setlocale(LC_ALL, string(cur_locale + ".UTF-8").c_str()) != nullptr) {
std::locale::global(std::locale(cur_locale + ".UTF-8"));
Logger::debug("Setting LC_ALL=" + cur_locale + ".UTF-8");
}
else if(std::setlocale(LC_ALL, "en_US.UTF-8") != nullptr) {
std::locale::global(std::locale("en_US.UTF-8"));
Logger::debug("Setting LC_ALL=en_US.UTF-8");
}
else {
@@ -977,8 +973,6 @@ int main(const int argc, const char** argv) {
Logger::info("Running on " + Term::current_tty);
}
Logger::debug(to_string(1.0).substr(1,1));
configure_tty_mode(cli.force_tty);
//? Check for valid terminal dimensions