diff --git a/app/javascript/mastodon/components/not_signed_in_indicator.tsx b/app/javascript/mastodon/components/not_signed_in_indicator.tsx
index 7a71f6539d..ce94c5d873 100644
--- a/app/javascript/mastodon/components/not_signed_in_indicator.tsx
+++ b/app/javascript/mastodon/components/not_signed_in_indicator.tsx
@@ -7,7 +7,7 @@ export const NotSignedInIndicator: React.FC = () => (
<div className='empty-column-indicator'>
<FormattedMessage
id='not_signed_in_indicator.not_signed_in'
- defaultMessage='You need to sign in to access this resource.'
+ defaultMessage='You need to login to access this resource.'
/>
</div>
</div>
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index f3db2c78d5..d9eff63cba 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -143,7 +143,7 @@ class InteractionModal extends React.PureComponent {
<div className='interaction-modal__choices'>
<div className='interaction-modal__choices__choice'>
<h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
- <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
+ <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
{signupButton}
</div>
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index af18ac3310..6419dbc50d 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -51,13 +51,13 @@ class Header extends React.PureComponent {
if (registrationsOpen) {
signupButton = (
- <a href='/auth/sign_up' className='button button-tertiary'>
+ <a href='/auth/sign_up' className='button'>
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
</a>
);
} else {
signupButton = (
- <button className='button button-tertiary' onClick={openClosedRegistrationsModal}>
+ <button className='button' onClick={openClosedRegistrationsModal}>
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
</button>
);
@@ -65,8 +65,8 @@ class Header extends React.PureComponent {
content = (
<>
- <a href='/auth/sign_in' className='button'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
{signupButton}
+ <a href='/auth/sign_in' className='button button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
</>
);
}
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
index 86fcc11b56..39f0c71c34 100644
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
@@ -16,13 +16,13 @@ const SignInBanner = () => {
if (registrationsOpen) {
signupButton = (
- <a href='/auth/sign_up' className='button button--block button-tertiary'>
+ <a href='/auth/sign_up' className='button button--block'>
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
</a>
);
} else {
signupButton = (
- <button className='button button--block button-tertiary' onClick={openClosedRegistrationsModal}>
+ <button className='button button--block' onClick={openClosedRegistrationsModal}>
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
</button>
);
@@ -30,9 +30,9 @@ const SignInBanner = () => {
return (
<div className='sign-in-banner'>
- <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.' /></p>
- <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
+ <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.' /></p>
{signupButton}
+ <a href='/auth/sign_in' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
</div>
);
};
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index a735d2ff36..6b1b51702f 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -356,7 +356,7 @@
{
"descriptors": [
{
- "defaultMessage": "You need to sign in to access this resource.",
+ "defaultMessage": "You need to login to access this resource.",
"id": "not_signed_in_indicator.not_signed_in"
}
],
@@ -2623,7 +2623,7 @@
"id": "interaction_modal.on_this_server"
},
{
- "defaultMessage": "Sign in",
+ "defaultMessage": "Login",
"id": "sign_in_banner.sign_in"
},
{
@@ -4175,7 +4175,7 @@
"id": "sign_in_banner.create_account"
},
{
- "defaultMessage": "Sign in",
+ "defaultMessage": "Login",
"id": "sign_in_banner.sign_in"
}
],
@@ -4374,11 +4374,11 @@
"id": "sign_in_banner.create_account"
},
{
- "defaultMessage": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
+ "defaultMessage": "Login to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
"id": "sign_in_banner.text"
},
{
- "defaultMessage": "Sign in",
+ "defaultMessage": "Login",
"id": "sign_in_banner.sign_in"
}
],
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 85040bf5b3..a9c9f534f6 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -391,7 +391,7 @@
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.search": "Search",
"navigation_bar.security": "Security",
- "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+ "not_signed_in_indicator.not_signed_in": "You need to login to access this resource.",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} favourited your post",
@@ -573,8 +573,8 @@
"server_banner.learn_more": "Learn more",
"server_banner.server_stats": "Server stats:",
"sign_in_banner.create_account": "Create account",
- "sign_in_banner.sign_in": "Sign in",
- "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
+ "sign_in_banner.sign_in": "Login",
+ "sign_in_banner.text": "Login to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
"status.admin_account": "Open moderation interface for @{name}",
"status.admin_domain": "Open moderation interface for {domain}",
"status.admin_status": "Open this post in the moderation interface",
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 458fa6d759..eef8214817 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -13,8 +13,8 @@ en:
locked: Your account is locked.
not_found_in_database: Invalid %{authentication_keys} or password.
pending: Your account is still under review.
- timeout: Your session expired. Please sign in again to continue.
- unauthenticated: You need to sign in or sign up before continuing.
+ timeout: Your session expired. Please login again to continue.
+ unauthenticated: You need to login or sign up before continuing.
unconfirmed: You have to confirm your email address before continuing.
mailer:
confirmation_instructions:
@@ -102,7 +102,7 @@ en:
unlocks:
send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes. Please check your spam folder if you didn't receive this email.
send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes. Please check your spam folder if you didn't receive this email.
- unlocked: Your account has been unlocked successfully. Please sign in to continue.
+ unlocked: Your account has been unlocked successfully. Please login to continue.
errors:
messages:
already_confirmed: was already confirmed, please try signing in
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0188519c26..29abec9437 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1027,8 +1027,8 @@ en:
new_confirmation_instructions_sent: You will receive a new e-mail with the confirmation link in a few minutes!
title: Check your inbox
sign_in:
- preamble_html: Sign in with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
- title: Sign in to %{domain}
+ preamble_html: Login with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
+ title: Login to %{domain}
sign_up:
manual_review: Sign-ups on %{domain} go through manual review by our moderators. To help us process your registration, write a bit about yourself and why you want an account on %{domain}.
preamble: With an account on this Mastodon server, you'll be able to follow any other person on the network, regardless of where their account is hosted.
@@ -1595,7 +1595,7 @@ en:
show_newer: Show newer
show_older: Show older
show_thread: Show thread
- sign_in_to_participate: Sign in to participate in the conversation
+ sign_in_to_participate: Login to participate in the conversation
title: '%{name}: "%{quote}"'
visibilities:
direct: Direct