Reduce empty translation error to infostream

rubenwardy · rubenwardy · commit 857dbcd5728e · 2021-02-07T16:03:48.000Z
Fixes #10905
diff --git a/src/translation.cpp b/src/translation.cpp
@@ -144,14 +144,13 @@ void Translations::loadTranslation(const std::string &data)
 		}
 
 		std::wstring oword1 = word1.str(), oword2 = word2.str();
-		if (oword2.empty()) {
-			oword2 = oword1;
-			errorstream << "Ignoring empty translation for \""
-			            << wide_to_utf8(oword1) << "\"" << std::endl;
+		if (!oword2.empty()) {
+			std::wstring translation_index = textdomain + L"|";
+			translation_index.append(oword1);
+			m_translations[translation_index] = oword2;
+		} else {
+			infostream << "Ignoring empty translation for \""
+				<< wide_to_utf8(oword1) << "\"" << std::endl;
 		}
-
-		std::wstring translation_index = textdomain + L"|";
-		translation_index.append(oword1);
-		m_translations[translation_index] = oword2;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -144,14 +144,13 @@ void Translations::loadTranslation(const std::string &data)`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`std::wstring oword1 = word1.str(), oword2 = word2.str();`
`147`		`- if (oword2.empty()) {`
`148`		`- oword2 = oword1;`
`149`		`- errorstream << "Ignoring empty translation for \""`
`150`		`- << wide_to_utf8(oword1) << "\"" << std::endl;`
	`147`	`+ if (!oword2.empty()) {`
	`148`	`+ std::wstring translation_index = textdomain + L"\|";`
	`149`	`+ translation_index.append(oword1);`
	`150`	`+ m_translations[translation_index] = oword2;`
	`151`	`+ } else {`
	`152`	`+ infostream << "Ignoring empty translation for \""`
	`153`	`+ << wide_to_utf8(oword1) << "\"" << std::endl;`
`151`	`154`	`}`
`152`		`-`
`153`		`- std::wstring translation_index = textdomain + L"\|";`
`154`		`- translation_index.append(oword1);`
`155`		`- m_translations[translation_index] = oword2;`
`156`	`155`	`}`
`157`	`156`	`}`