aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-03-10 01:49:03 +0000
committerGitHub <noreply@github.com>2019-03-10 01:49:03 +0000
commit0b492f82f77eb121d0c9af66ddf5e86f3ebbc876 (patch)
tree9169683b622edd8b56c8136552a105f80c6db6e6 /src
parent431d8a9b83be858193328fe59e75026fa023393f (diff)
downloadminetest-0b492f82f77eb121d0c9af66ddf5e86f3ebbc876.tar.gz
minetest-0b492f82f77eb121d0c9af66ddf5e86f3ebbc876.tar.bz2
minetest-0b492f82f77eb121d0c9af66ddf5e86f3ebbc876.zip
Confirm registration GUI: Remove positional strings to fix Windows bug (#8258)
Positional strings don't work on some Windows builds. Remove server address string, leave player name string present.
Diffstat (limited to 'src')
-rw-r--r--src/gui/guiConfirmRegistration.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp
index 9a374b405..6e6b7ad16 100644
--- a/src/gui/guiConfirmRegistration.cpp
+++ b/src/gui/guiConfirmRegistration.cpp
@@ -89,23 +89,18 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
*/
s32 ypos = 30 * s;
{
- std::string address = m_address;
- if (address.empty())
- address = "localhost";
core::rect<s32> rect2(0, 0, 540 * s, 180 * s);
rect2 += topleft_client + v2s32(30 * s, ypos);
static const std::string info_text_template = strgettext(
- "You are about to join the server at %1$s with the "
- "name \"%2$s\" for the first time. If you proceed, a "
- "new account using your credentials will be created "
- "on this server.\n"
- "Please retype your password and click Register and "
- "Join to confirm account creation or click Cancel to "
- "abort.");
+ "You are about to join this server with the name \"%s\" for the "
+ "first time.\n"
+ "If you proceed, a new account using your credentials will be "
+ "created on this server.\n"
+ "Please retype your password and click 'Register and Join' to "
+ "confirm account creation, or click 'Cancel' to abort.");
char info_text_buf[1024];
porting::mt_snprintf(info_text_buf, sizeof(info_text_buf),
- info_text_template.c_str(), address.c_str(),
- m_playername.c_str());
+ info_text_template.c_str(), m_playername.c_str());
wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf);
gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true,