Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-15 10:49:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Confirm registration GUI: Remove positional strings to fix Windows bug (#8258)

Browse Source 
Positional strings don't work on some Windows builds.
Remove server address string, leave player name string present.
This commit is contained in:
Paramat 2019-03-10 01:49:03 +00:00 committed by rubenwardy
parent da4739a26c
commit bf4deb0ce6
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/guiConfirmRegistration.cpp
View File

@ -89,23 +89,18 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
*/ */
s32 ypos = 30 * s; s32 ypos = 30 * s;
{ {
std::string address = m_address;
if (address.empty())
address = "localhost";
core::rect<s32> rect2(0, 0, 540 * s, 180 * s); core::rect<s32> rect2(0, 0, 540 * s, 180 * s);
rect2 += topleft_client + v2s32(30 * s, ypos); rect2 += topleft_client + v2s32(30 * s, ypos);
static const std::string info_text_template = strgettext( static const std::string info_text_template = strgettext(
"You are about to join the server at %1$s with the " "You are about to join this server with the name \"%s\" for the "
"name \"%2$s\" for the first time. If you proceed, a " "first time.\n"
"new account using your credentials will be created " "If you proceed, a new account using your credentials will be "
"on this server.\n" "created on this server.\n"
"Please retype your password and click Register and " "Please retype your password and click 'Register and Join' to "
"Join to confirm account creation or click Cancel to " "confirm account creation, or click 'Cancel' to abort.");
"abort.");
char info_text_buf[1024]; char info_text_buf[1024];
porting::mt_snprintf(info_text_buf, sizeof(info_text_buf), porting::mt_snprintf(info_text_buf, sizeof(info_text_buf),
info_text_template.c_str(), address.c_str(), info_text_template.c_str(), m_playername.c_str());
m_playername.c_str());
wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf); wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf);
gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true, gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true,