BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

GUIFormSpecMenu: Fix label multiline translation (#12527)

Browse Source
This commit is contained in:
SmallJoker 2022-07-14 20:51:01 +02:00 committed by GitHub
parent ac4eb746fe
commit f4c6ed863d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/guiFormSpecMenu.cpp
View File

@ -1731,25 +1731,27 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element)
return; return;
std::vector<std::string> v_pos = split(parts[0],','); std::vector<std::string> v_pos = split(parts[0],',');
std::string text = parts[1];
MY_CHECKPOS("label",0); MY_CHECKPOS("label",0);
if(!data->explicit_size) if(!data->explicit_size)
warningstream<<"invalid use of label without a size[] element"<<std::endl; warningstream<<"invalid use of label without a size[] element"<<std::endl;
std::vector<std::string> lines = split(text, '\n');
auto style = getDefaultStyleForElement("label", ""); auto style = getDefaultStyleForElement("label", "");
gui::IGUIFont *font = style.getFont(); gui::IGUIFont *font = style.getFont();
if (!font) if (!font)
font = m_font; font = m_font;
for (unsigned int i = 0; i != lines.size(); i++) { EnrichedString str(unescape_string(utf8_to_wide(parts[1])));
std::wstring wlabel_colors = translate_string( size_t str_pos = 0;
utf8_to_wide(unescape_string(lines[i])));
// Without color escapes to get the font dimensions for (size_t i = 0; str_pos < str.size(); ++i) {
std::wstring wlabel_plain = unescape_enriched(wlabel_colors); // Split per line
size_t str_nl = str.getString().find(L'\n', str_pos);
if (str_nl == std::wstring::npos)
str_nl = str.getString().size();
EnrichedString line = str.substr(str_pos, str_nl - str_pos);
str_pos += line.size() + 1;
core::rect<s32> rect; core::rect<s32> rect;
@ -1766,7 +1768,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element)
rect = core::rect<s32>( rect = core::rect<s32>(
pos.X, pos.Y, pos.X, pos.Y,
pos.X + font->getDimension(wlabel_plain.c_str()).Width, pos.X + font->getDimension(line.c_str()).Width,
pos.Y + imgsize.Y); pos.Y + imgsize.Y);
} else { } else {
@ -1788,19 +1790,19 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element)
rect = core::rect<s32>( rect = core::rect<s32>(
pos.X, pos.Y - m_btn_height, pos.X, pos.Y - m_btn_height,
pos.X + font->getDimension(wlabel_plain.c_str()).Width, pos.X + font->getDimension(line.c_str()).Width,
pos.Y + m_btn_height); pos.Y + m_btn_height);
} }
FieldSpec spec( FieldSpec spec(
"", "",
wlabel_colors, L"",
L"", L"",
258 + m_fields.size(), 258 + m_fields.size(),
4 4
); );
gui::IGUIStaticText *e = gui::StaticText::add(Environment, gui::IGUIStaticText *e = gui::StaticText::add(Environment,
spec.flabel.c_str(), rect, false, false, data->current_parent, line, rect, false, false, data->current_parent,
spec.fid); spec.fid);
e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_CENTER); e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_CENTER);