X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Ftranslation.cpp;h=82e813a5d59b0f8f3813a828c566baa7260fcf18;hb=ed0882fd58fb0f663cc115d23a11643874facc06;hp=60531be67ee3c14a0265c17b32c15fc828dfac3c;hpb=b620f2f02db4755f988f24522f4d77d890f6421d;p=minetest.git

diff --git a/src/translation.cpp b/src/translation.cpp
index 60531be67..82e813a5d 100644
--- a/src/translation.cpp
+++ b/src/translation.cpp
@@ -20,14 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "translation.h"
 #include "log.h"
 #include "util/string.h"
+#include <unordered_map>
 
-static Translations main_translations;
-Translations *g_translations = &main_translations;
 
-Translations::~Translations()
-{
-	clear();
-}
+#ifndef SERVER
+// Client translations
+Translations client_translations;
+Translations *g_client_translations = &client_translations;
+#endif
+
 
 void Translations::clear()
 {
@@ -41,7 +42,7 @@ const std::wstring &Translations::getTranslation(
 	try {
 		return m_translations.at(key);
 	} catch (const std::out_of_range &) {
-		warningstream << "Translations: can't find translation for string \""
+		verbosestream << "Translations: can't find translation for string \""
 		              << wide_to_utf8(s) << "\" in textdomain \""
 		              << wide_to_utf8(textdomain) << "\"" << std::endl;
 		// Silence that warning in the future
@@ -58,6 +59,10 @@ void Translations::loadTranslation(const std::string &data)
 
 	while (is.good()) {
 		std::getline(is, line);
+		// Trim last character if file was using a \r\n line ending
+		if (line.length () > 0 && line[line.length() - 1] == '\r')
+			line.resize(line.length() - 1);
+
 		if (str_starts_with(line, "# textdomain:")) {
 			textdomain = utf8_to_wide(trim(str_split(line, ':')[1]));
 		}
@@ -145,6 +150,8 @@ void Translations::loadTranslation(const std::string &data)
 			            << wide_to_utf8(oword1) << "\"" << std::endl;
 		}
 
-		m_translations[textdomain + L"|" + oword1] = oword2;
+		std::wstring translation_index = textdomain + L"|";
+		translation_index.append(oword1);
+		m_translations[translation_index] = oword2;
 	}
 }