From 33aaf950e24674b316fd4c8fb6fe7dc62942c773 Mon Sep 17 00:00:00 2001
From: jeefo <dmitry@jeefo.net>
Date: Wed, 15 May 2024 23:57:23 +0300
Subject: [PATCH] fix: eating whitespaces in translations (resolves #372)

Co-Authored-By: Max <161382234+dyspose@users.noreply.github.com>
---
 cfg/addons/yapb/conf/lang/ru_lang.cfg | 40 +++++++++++++++------------
 src/config.cpp                        |  8 ++++--
 src/graph.cpp                         |  2 +-
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/cfg/addons/yapb/conf/lang/ru_lang.cfg b/cfg/addons/yapb/conf/lang/ru_lang.cfg
index a4da326..2a5fb9c 100644
--- a/cfg/addons/yapb/conf/lang/ru_lang.cfg
+++ b/cfg/addons/yapb/conf/lang/ru_lang.cfg
@@ -2729,49 +2729,43 @@ header:
 magic: %d
 
 [TRANSLATED]
-магическое число: %d
+  магическое число: %d
 
 [ORIGINAL]
 version: %d
 
 [TRANSLATED]
-версия: %d
+  версия: %d
 
 [ORIGINAL]
 node_count: %d
 
 [TRANSLATED]
-количество точек: %d
+  количество точек: %d
 
 [ORIGINAL]
 compressed_size: %dkB
 
 [TRANSLATED]
-размер с сжатием: %dКБ
+  размер с сжатием: %dКБ
 
 [ORIGINAL]
 uncompressed_size: %dkB
 
 [TRANSLATED]
-размер без сжатия: %dКБ
+  размер без сжатия: %dКБ
 
 [ORIGINAL]
 options: %d
 
 [TRANSLATED]
-опции: %d
+  опции: %d
 
 [ORIGINAL]
-analyzed: yes
+analyzed: %s
 
 [TRANSLATED]
-проанализировано: да
-
-[ORIGINAL]
-analyzed: no
-
-[TRANSLATED]
-проанализировано: нет
+  проанализировано: %s
 
 [ORIGINAL]
 extensions:
@@ -2783,19 +2777,19 @@ extensions:
 author: %s
 
 [TRANSLATED]
-автор: %s
+  автор: %s
 
 [ORIGINAL]
 modified_by: %s
 
 [TRANSLATED]
-модифицировано: %s
+  модифицировано: %s
 
 [ORIGINAL]
 bsp_size: %d
 
 [TRANSLATED]
-размер bsp: %d
+  размер bsp: %d
 
 [ORIGINAL]
 Force-enable Xash3D sv_forcesimulating cvar.
@@ -2826,3 +2820,15 @@ You're launched standalone version of %s. Metamod is not installed or not enable
 
 [TRANSLATED]
 Вы запустили автономную версию %s. Metamod не установлен или не включён!
+
+[ORIGINAL]
+yes
+
+[TRANSLATED]
+да
+
+[ORIGINAL]
+no
+
+[TRANSLATED]
+нет
diff --git a/src/config.cpp b/src/config.cpp
index 87b84b1..5d1f270 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -482,8 +482,12 @@ void BotConfig::loadLanguageConfig () {
       String temp;
       Twin <String, String> lang;
 
+      auto trimWithoutWs = [] (String in) -> String {
+         return in.trim ("\r\n");
+      };
+
       auto pushTranslatedMsg = [&] () {
-         m_language[hashLangString (lang.first.trim ().chars ())] = lang.second.trim ();
+         m_language[hashLangString (trimWithoutWs (lang.first).chars ())] = trimWithoutWs (lang.second);
       };
 
       // clear all the translations before new load
@@ -512,7 +516,7 @@ void BotConfig::loadLanguageConfig () {
 
          // make sure last string is translated
          if (file.eof () && !lang.first.empty ()) {
-            lang.second = line.trim ();
+            lang.second = trimWithoutWs (line);
             pushTranslatedMsg ();
          }
       }
diff --git a/src/graph.cpp b/src/graph.cpp
index eb17ad8..bd0823e 100644
--- a/src/graph.cpp
+++ b/src/graph.cpp
@@ -1274,7 +1274,7 @@ void BotGraph::showFileInfo () {
    msg ("  compressed_size: %dkB", m_graphHeader.compressed / 1024);
    msg ("  uncompressed_size: %dkB", m_graphHeader.uncompressed / 1024);
    msg ("  options: %d", m_graphHeader.options); // display as string ?
-   msg ("  analyzed: %s", isAnalyzed () ? "yes" : "no"); // display as string ?
+   msg ("  analyzed: %s", isAnalyzed () ? conf.translate ("yes") : conf.translate ("no")); // display as string ?
 
    msg ("");