From: Nathanaël Courant <Ekdohibs@users.noreply.github.com>
Date: Sat, 23 Feb 2019 19:55:54 +0000 (+0100)
Subject: Fix files with CRLF line endings in translations (#8280)
X-Git-Tag: 5.0.0~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eeb67627ec75f9c42e089b5e90686017b7eb62c8;p=oweals%2Fminetest.git

Fix files with CRLF line endings in translations (#8280)
---

diff --git a/src/translation.cpp b/src/translation.cpp
index 649c3b282..7ddd95591 100644
--- a/src/translation.cpp
+++ b/src/translation.cpp
@@ -58,6 +58,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]));
 		}