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

Removed 'sign' (in/out), use 'log' (in/out) instead.

Browse Source
This commit is contained in:
hiker 2015-01-08 13:32:50 +11:00
parent 596366c3e0
commit 520625adae
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/gui/online/guest_login.stkgui
View File

@ -15,19 +15,19 @@
<box proportion="1" width="100%" layout="vertical-row">
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the login dialog" text="Guest Sign in"/>
I18N="In the login dialog" text="Guest Log in"/>
<spacer height="15" width="10"/>
<box proportion="4" width="90%" layout="vertical-row" align="center">
<div x="2%" y="2%" width="96%" height="80%" layout="vertical-row" id="outer_box" >
<label I18N="In the login dialog" proportion="4" word_wrap="true"
text="Signing in as a guest allows you to participate in online races, but it does not allow you to vote for addons, or collect any achievements while being online."
text="Logging in as a guest allows you to participate in online races, but it does not allow you to vote for addons, or collect any achievements while being online."
align="center"/>
</div>
</box>
<spacer height="15" width="10"/>
<buttonbar id="options" width="90%" height="13%" align="bottom">
<icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
I18N="In the login dialog" text="Sign In" label_location="bottom"/>
I18N="In the login dialog" text="Log In" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
I18N="In the login dialog" text="Close" label_location="bottom"/>
</buttonbar>

2
data/gui/online/main.stkgui
View File

@ -35,7 +35,7 @@
<icon-button id="profile" width="64" height="64" icon="gui/green_check.png" extend_label="50"
I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
<icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png" extend_label="70"
I18N="In the online multiplayer screen" text="Sign Out" label_location="hover"/>
I18N="In the online multiplayer screen" text="Log Out" label_location="hover"/>
</buttonbar>
</bottombar>

4
src/main.cpp
View File

@ -479,8 +479,8 @@ void cmdLineHelp()
// " n=1: recorded positions\n"
// " n=2: recorded key strokes\n"
" --server Start a server (not a playing client).\n"
" --login=s Automatically sign in (set the login).\n"
" --password=s Automatically sign in (set the password).\n"
" --login=s Automatically log in (set the login).\n"
" --password=s Automatically log in (set the password).\n"
" --port=n Port number to use.\n"
" --max-players=n Maximum number of clients (server only).\n"
" --no-console Does not write messages in the console but to\n"

4
src/online/online_player_profile.cpp
View File

@ -246,7 +246,7 @@ namespace Online
m_player = player;
m_player->setUserDetails(this,
m_player->rememberPassword() ? "client-quit"
: "disconnect");
: "disconnect");
setAbortable(false);
} // SignOutRequest
}; // SignOutRequest
@ -274,7 +274,7 @@ namespace Online
if (!success)
{
Log::warn("OnlinePlayerProfile::signOut",
"There were some connection issues while signing out. "
"There were some connection issues while logging out. "
"Report a bug if this caused issues.");
Log::warn("OnlinePlayerProfile::signOut", core::stringc(info.c_str()).c_str());
if (user_screen)

6
src/states_screens/online_screen.cpp
View File

@ -136,7 +136,7 @@ void OnlineScreen::init()
Screen::init();
setInitialFocus();
DemoWorld::resetIdleTime();
core::stringw m = _("Signed in as: %s.",
core::stringw m = _("Logged in as: %s.",
PlayerManager::getCurrentOnlineUserName());
m_online_status_widget->setText(m, false);
} // init
@ -152,12 +152,12 @@ void OnlineScreen::onUpdate(float delta)
if (m_recorded_state == PlayerProfile::OS_SIGNING_IN)
{
m_online_status_widget->setText(StringUtils::loadingDots(_("Signing in")),
m_online_status_widget->setText(StringUtils::loadingDots(_("Logging in")),
false );
}
else if (m_recorded_state == PlayerProfile::OS_SIGNING_OUT)
{
m_online_status_widget->setText(StringUtils::loadingDots(_("Signing out")),
m_online_status_widget->setText(StringUtils::loadingDots(_("Logging out")),
false );
}
} // onUpdate

4
src/states_screens/user_screen.cpp
View File

@ -441,8 +441,8 @@ void BaseUserScreen::onUpdate(float dt)
if (!m_options_widget->isActivated())
{
core::stringw message = (m_state & STATE_LOGOUT)
? _(L"Signing out '%s'",m_sign_out_name.c_str())
: _(L"Signing in '%s'", m_sign_in_name.c_str());
? _(L"Logging out '%s'",m_sign_out_name.c_str())
: _(L"Logging in '%s'", m_sign_in_name.c_str());
m_info_widget->setText(StringUtils::loadingDots(message.c_str()),
false );
}