From eeb67627ec75f9c42e089b5e90686017b7eb62c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathana=C3=ABl=20Courant?= Date: Sat, 23 Feb 2019 20:55:54 +0100 Subject: [PATCH] Fix files with CRLF line endings in translations (#8280) --- src/translation.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/translation.cpp b/src/translation.cpp index 649c3b28..7ddd9559 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])); }