ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use better english as alayan suggested

Browse Source
This commit is contained in:
Benau 2018-11-14 16:01:36 +08:00
parent 721270c5a9
commit 5e711088bf
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/gui/screens/online/networking_lobby.stkgui
View File

@ -15,14 +15,14 @@
</div>
</div>
<spacer height="2%"/>
<div x="2%" width="96%" height="fit" layout="horizontal-row">
<box proportion="4" height="fit" layout="vertical-row">
<div x="2%" width="96%" height="18%" layout="horizontal-row">
<box proportion="4" height="100%" layout="vertical-row">
<textbox id="chat" width="100%"/>
<spacer height="10"/>
<spacer height="20%"/>
<div width="100%" height="fit" layout="horizontal-row">
<button id="send" width="20%" height="fit" I18N="In the network lobby" text="Send" />
<spacer width="1%"/>
<label id="timeout-message" width="79%" height="fit"/>
<button id="send" width="20%" height="fit" I18N="In the network lobby" text="Send"/>
<spacer width="3%"/>
<label id="timeout-message" width="79%" height="fit" text="" word_wrap="true" align="center"/>
</div>
</box>
<spacer width="3%"/>

15
src/states_screens/online/networking_lobby.cpp
View File

@ -250,7 +250,7 @@ void NetworkingLobby::onUpdate(float delta)
//I18N: In the networking lobby, show when player is required to wait
//before the current game finish
core::stringw msg = _("Please wait for current game to end.");
m_timeout_message->setText(msg, true);
m_timeout_message->setText(msg, false);
core::stringw total_msg;
for (auto& string : m_server_info)
{
@ -281,7 +281,7 @@ void NetworkingLobby::onUpdate(float delta)
_P("Game will start if there is more than %d player.",
"Game will start if there are more than %d players.",
(int)(m_min_start_game_players - 1));
m_timeout_message->setText(msg, true);
m_timeout_message->setText(msg, false);
}
if (m_cur_starting_timer != std::numeric_limits<int64_t>::max())
@ -292,11 +292,12 @@ void NetworkingLobby::onUpdate(float delta)
remain = 0;
//I18N: In the networking lobby, display the starting timeout
//for owner-less server to begin a game
core::stringw msg = _P("Starting after %d second "
"or everyone pressed 'Ready' button.",
"Starting after %d seconds "
"or everyone pressed 'Ready' button.", (int)remain);
m_timeout_message->setText(msg, true);
core::stringw msg = _P("Starting after %d second, "
"or once everyone has pressed the 'Ready' button.",
"Starting after %d seconds, "
"or once everyone has pressed the 'Ready' button.",
(int)remain);
m_timeout_message->setText(msg, false);
}
}
else