Fix for translating empty strings

minduser00 · SmallJoker · commit 6257c7f659b9 · 2018-04-09T11:02:03.000+02:00
Fix for incorrect translation of empty strings

In the key change menu, when a button key not have name an empty string is passed to gettext.
The empty string is reserved for gettext to return de header of the .po file an this is shoved in the button
diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
@@ -153,9 +153,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 		{
 			core::rect < s32 > rect(0, 0, 100, 30);
 			rect += topleft + v2s32(offset.X + 120, offset.Y - 5);
-			const wchar_t *text = wgettext(k->key.name());
-			k->button = Environment->addButton(rect, this, k->id, text);
-			delete[] text;
+			k->button = Environment->addButton(rect, this, k->id,
+							   k->key.name()[0] ? wgettext(k->key.name()) : L"");
 		}
 		if ((i + 1) % KMaxButtonPerColumns == 0) {
 			offset.X += 230;

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)`
`153`	`153`	`{`
`154`	`154`	`core::rect < s32 > rect(0, 0, 100, 30);`
`155`	`155`	`rect += topleft + v2s32(offset.X + 120, offset.Y - 5);`
`156`		`- const wchar_t *text = wgettext(k->key.name());`
`157`		`- k->button = Environment->addButton(rect, this, k->id, text);`
`158`		`- delete[] text;`
	`156`	`+ k->button = Environment->addButton(rect, this, k->id,`
	`157`	`+ k->key.name()[0] ? wgettext(k->key.name()) : L"");`
`159`	`158`	`}`
`160`	`159`	`if ((i + 1) % KMaxButtonPerColumns == 0) {`
`161`	`160`	`offset.X += 230;`