tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-10-28 23:12:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Issue#1552. Calendar module, LC_TIME variable

Browse Source
This commit is contained in:
Viktar Lukashonak
2022-05-13 12:54:18 +03:00
parent 7b7ee41e13
commit 448b413eca
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/clock.cpp
View File

@@ -66,17 +66,12 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
}
}
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();
}
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();
}
thread_ = [this] {