RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Issue#1552. Calendar module, LC_TIME variable" 

This reverts commit 448b413eca.
pull/1555/head
Viktar Lukashonak 2022-05-13 22:58:00 +03:00
parent e615612bf4
commit 5a014305ec
No known key found for this signature in database
GPG Key ID: 08A413AA87200A6F
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/clock.cpp
View File

@ -66,12 +66,17 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
}
}
const char* applyLocale{config_["locale"].isString() ? config_["locale"].asCString() : getenv("LC_TIME")};
try {
locale_ = applyLocale ? std::locale(applyLocale) : std::locale("");
} catch(std::runtime_error const& localeE) {
spdlog::warn("Clock module. Wrong \"locale\" or LC_TIME variable(make sure locale is presented in /etc/locale.gen and generated by the locale-gen). Trace: {0}", localeE.what());
locale_ = std::locale();
if (config_["locale"].isString()) {
locale_ = std::locale(config_["locale"].asString());
} else {
char* sysLocale{getenv("LC_TIME")};
try {
locale_ = sysLocale ? std::locale(sysLocale) : std::locale("");
}
catch(std::runtime_error const& localeErr) {
spdlog::warn(localeErr.what());
locale_ = std::locale();
}
}
thread_ = [this] {