update locale log messages

This commit is contained in:
MihailRis
2024-12-07 00:52:40 +03:00
parent 27acc1d8b1
commit 1ab3707343
+11 -9
View File
@@ -37,8 +37,9 @@ const std::string& langs::Lang::getId() const {
return locale; return locale;
} }
// @brief Language key-value txt files parser /// @brief Language key-value txt files parser
class Reader : BasicParser { namespace {
class Reader : BasicParser {
void skipWhitespace() override { void skipWhitespace() override {
BasicParser::skipWhitespace(); BasicParser::skipWhitespace();
if (hasNext() && source[pos] == '#') { if (hasNext() && source[pos] == '#') {
@@ -48,8 +49,9 @@ class Reader : BasicParser {
} }
} }
} }
public: public:
Reader(std::string_view file, std::string_view source) : BasicParser(file, source) { Reader(std::string_view file, std::string_view source)
: BasicParser(file, source) {
} }
void read(langs::Lang& lang, const std::string &prefix) { void read(langs::Lang& lang, const std::string &prefix) {
@@ -60,15 +62,15 @@ public:
key = prefix + key; key = prefix + key;
std::string text = parseString('\n', false); std::string text = parseString('\n', false);
util::trim(text); util::trim(text);
lang.put(util::str2wstr_utf8(key), lang.put(util::str2wstr_utf8(key), util::str2wstr_utf8(text));
util::str2wstr_utf8(text));
skipWhitespace(); skipWhitespace();
} }
} }
}; };
}
void langs::loadLocalesInfo(const fs::path& resdir, std::string& fallback) { void langs::loadLocalesInfo(const fs::path& resdir, std::string& fallback) {
fs::path file = resdir/fs::path(langs::TEXTS_FOLDER)/fs::path("langs.json"); auto file = resdir/fs::u8path(langs::TEXTS_FOLDER)/fs::u8path("langs.json");
auto root = files::read_json(file); auto root = files::read_json(file);
langs::locales_info.clear(); langs::locales_info.clear();
@@ -85,7 +87,7 @@ void langs::loadLocalesInfo(const fs::path& resdir, std::string& fallback) {
} else { } else {
continue; continue;
} }
logline << "[" << key << " (" << name << ")] "; logline << key << " ";
langs::locales_info[key] = LocaleInfo {key, name}; langs::locales_info[key] = LocaleInfo {key, name};
} }
logline << "added"; logline << "added";