diff --git a/main.cpp b/main.cpp index 4aa7d45..540366a 100644 --- a/main.cpp +++ b/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(); diff --git a/translations/en_US.ts b/translations/en_US.ts index af0ac7d..08f5682 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -382,47 +382,47 @@ - + Please, select a picture where QR code that contains info about check is present Please, select a picture where QR code that contains info about check is present - + Picture was not selected Picture was not selected - + Selected image: Selected image: - + Captcha was not solved correctly! Captcha was not solved correctly! - + Captcha is incorrect Captcha is incorrect - + Internal server error. Please, try again later. Internal server error. Please, try again later. - + Internal server error Internal server error - + Check not found. Please, ensure correctness of entered data. Check not found. Please, ensure correctness of entered data. - + Check was not found Check was not found diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index ed7f001..a600396 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -382,47 +382,47 @@ - + Please, select a picture where QR code that contains info about check is present Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке - + Picture was not selected Изображение не было выбрано - + Selected image: Выбранное изображение: - + Captcha was not solved correctly! Капча была решена неверно! - + Captcha is incorrect Капча введена неверно - + Internal server error. Please, try again later. Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. - + Internal server error Внутренняя ошибка сервера - + Check not found. Please, ensure correctness of entered data. Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. - + Check was not found Чек не найден