From 1ab37073433c0655f54adb16ff57f6d3955e439f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 7 Dec 2024 00:52:40 +0300
Subject: [PATCH] update locale log messages

---
 src/frontend/locale.cpp | 58 +++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp
index de040a11..2af78076 100644
--- a/src/frontend/locale.cpp
+++ b/src/frontend/locale.cpp
@@ -37,38 +37,40 @@ const std::string& langs::Lang::getId() const {
     return locale;
 }
 
-// @brief Language key-value txt files parser
-class Reader : BasicParser {
-    void skipWhitespace() override {
-        BasicParser::skipWhitespace();
-        if (hasNext() && source[pos] == '#') {
-            skipLine();
-            if (hasNext() && is_whitespace(peek())) {
+/// @brief Language key-value txt files parser
+namespace {
+    class Reader : BasicParser {
+        void skipWhitespace() override {
+            BasicParser::skipWhitespace();
+            if (hasNext() && source[pos] == '#') {
+                skipLine();
+                if (hasNext() && is_whitespace(peek())) {
+                    skipWhitespace();
+                }
+            }
+        }
+    public:
+        Reader(std::string_view file, std::string_view source)
+            : BasicParser(file, source) {
+        }
+
+        void read(langs::Lang& lang, const std::string &prefix) {
+            skipWhitespace();
+            while (hasNext()) {
+                std::string key = parseString('=', true);
+                util::trim(key);
+                key = prefix + key;
+                std::string text = parseString('\n', false);
+                util::trim(text);
+                lang.put(util::str2wstr_utf8(key), util::str2wstr_utf8(text));
                 skipWhitespace();
             }
         }
-    }
-public:
-    Reader(std::string_view file, std::string_view source) : BasicParser(file, source) {
-    }
-
-    void read(langs::Lang& lang, const std::string &prefix) {
-        skipWhitespace();
-        while (hasNext()) {
-            std::string key = parseString('=', true);
-            util::trim(key);
-            key = prefix + key;
-            std::string text = parseString('\n', false);
-            util::trim(text);
-            lang.put(util::str2wstr_utf8(key),
-                     util::str2wstr_utf8(text));
-            skipWhitespace();
-        }
-    }
-};
+    };
+}
 
 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);
 
     langs::locales_info.clear();
@@ -85,7 +87,7 @@ void langs::loadLocalesInfo(const fs::path& resdir, std::string& fallback) {
             } else {
                 continue;
             }
-            logline << "[" << key << " (" << name << ")] ";
+            logline << key << " ";
             langs::locales_info[key] = LocaleInfo {key, name};
         } 
         logline << "added";