tolerate old version of hlohmann::json
This commit is contained in:
8
main.cpp
8
main.cpp
@@ -50,11 +50,13 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
QTranslator translator;
|
||||
QString lang = "en_US";
|
||||
#if NLOHMANN_JSON_VERSION_MAJOR < 3 && NLOHMANN_JSON_VERSION_MINOR < 6 && NLOHMANN_JSON_VERSION_PATCH
|
||||
//TODO: implement
|
||||
bool languageSettingPresent = false;
|
||||
#if NLOHMANN_JSON_VERSION_MAJOR < 3 && NLOHMANN_JSON_VERSION_MINOR < 6 && NLOHMANN_JSON_VERSION_PATCH < 0
|
||||
languageSettingPresent = s.get_all_settings().find("language") != s.get_all_settings().end();
|
||||
#else
|
||||
if (s.get_all_settings().contains("language")) {
|
||||
languageSettingPresent = s.get_all_settings().contains("language");
|
||||
#endif
|
||||
if (languageSettingPresent) {
|
||||
lang = QString::fromStdString(s.get_all_settings()["language"]);
|
||||
} else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) {
|
||||
lang = QLocale::system().name();
|
||||
|
||||
Reference in New Issue
Block a user