Sign In => Log in

This commit is contained in:
Sean Yesmunt 2020-08-24 13:59:37 -04:00
parent 248e578422
commit 2dee81b624
17 changed files with 38 additions and 38 deletions

View file

@ -51,7 +51,7 @@ function cleanUpAfterSigning() {
}
function signFile() {
console.log('Signing file with hashes using keybase...');
console.log('Logging in file with hashes using keybase...');
// All files are hashed and added to hashes.txt
// Sign it with keybase
const fileName = `LBRY_${versionToSign}_sigs.asc`;

View file

@ -506,9 +506,9 @@
"Upload something totally wacky and wild.": "Upload something totally wacky and wild.",
"Available Rewards": "Available Rewards",
"Follow New Tags": "Follow New Tags",
"Sign In": "Sign In",
"Log In": "Log In",
"Go Back": "Go Back",
"Sign In To LBRY": "Sign In To LBRY",
"Log In To LBRY": "Log In To LBRY",
"Create a new account or sign in.": "Create a new account or sign in.",
"Terms of Service": "Terms of Service",
"Learn More": "Learn More",
@ -597,9 +597,8 @@
"Sign Out": "Sign Out",
"Portuguese": "Portuguese",
"Follow more tags": "Follow more tags",
"Sign In to LBRY": "Sign In to LBRY",
"Log In to LBRY": "Log In to LBRY",
"Check Your Email": "Check Your Email",
"sign in": "sign in",
"Resend link": "Resend link",
"Sync your balance and preferences across devices.": "Sync your balance and preferences across devices.",
"Add Email": "Add Email",
@ -641,7 +640,6 @@
"This will appear as a tip for %title%, which will boost its ability to be discovered while active.": "This will appear as a tip for %title%, which will boost its ability to be discovered while active.",
"Awesome! You just subscribed to your first channel. If we have your email address, we will send you notifications related to new content.": "Awesome! You just subscribed to your first channel. If we have your email address, we will send you notifications related to new content.",
"Update email preferences": "Update email preferences",
"Sign In to lbry.tv": "Sign In to lbry.tv",
"An account with lbry.tv allows you to earn rewards and backup your data.": "An account with lbry.tv allows you to earn rewards and backup your data.",
"Backup your account and wallet data.": "Backup your account and wallet data.",
"Awesome! You just subscribed to your first channel.": "Awesome! You just subscribed to your first channel.",
@ -705,7 +703,6 @@
"Claimable": "Claimable",
"Invite A Friend": "Invite A Friend",
"Navigation": "Navigation",
"Sign In to lbry.tv to Earn Rewards": "Sign In to lbry.tv to Earn Rewards",
"Unlock Rewards": "Unlock Rewards",
"A lbry.tv account allows you to earn more than %credit_amount% in rewards, backup your data, and get content and security updates.": "A lbry.tv account allows you to earn more than %credit_amount% in rewards, backup your data, and get content and security updates.",
"Deposit cannot be higher than your balance": "Deposit cannot be higher than your balance",
@ -778,7 +775,7 @@
"There was an error. Try %refreshing_the_app_link% to fix it. If that doesn't work, try pressing Ctrl+R/Cmd+R.": "There was an error. Try %refreshing_the_app_link% to fix it. If that doesn't work, try pressing Ctrl+R/Cmd+R.",
"You are not currently sharing diagnostic data so this error was not reported.": "You are not currently sharing diagnostic data so this error was not reported.",
"Find Channels to Follow": "Find Channels to Follow",
"Sign in with lbry.tv to receive notifications about new content.": "Sign in with lbry.tv to receive notifications about new content.",
"Log in with lbry.tv to receive notifications about new content.": "Log in with lbry.tv to receive notifications about new content.",
"Find new channels to follow": "Find new channels to follow",
"%SITE_NAME% is more fun if you're following channels": "%SITE_NAME% is more fun if you're following channels",
"Saved zip archive to %outputPath%": "Saved zip archive to %outputPath%",
@ -897,7 +894,6 @@
"Total Staked Amount": "Total Staked Amount",
"Set Inviter": "Set Inviter",
"Change Inviter": "Change Inviter",
"Sign In to lbry.tv to Earn Rewards From Inviting Your Friends": "Sign In to lbry.tv to Earn Rewards From Inviting Your Friends",
"You haven't uploaded anything with this channel yet!": "You haven't uploaded anything with this channel yet!",
"You haven't created a channel yet, let's fix that!": "You haven't created a channel yet, let's fix that!",
"Upload Something": "Upload Something",
@ -954,7 +950,7 @@
"Account Password": "Account Password",
"You do not currently have a password set.": "You do not currently have a password set.",
"Enter Your lbry.tv Password": "Enter Your lbry.tv Password",
"Signing in as %email%": "Signing in as %email%",
"Logging in in as %email%": "Logging in in as %email%",
"Forgot Password?": "Forgot Password?",
"Use Magic Link": "Use Magic Link",
"Password updated successfully.": "Password updated successfully.",
@ -1210,7 +1206,7 @@
"Send a chunk of change to this creator to let them know you appreciate their content.": "Send a chunk of change to this creator to let them know you appreciate their content.",
"CableTube Escape Artists": "CableTube Escape Artists",
"Unlink YouTube Channel": "Unlink YouTube Channel",
"Sign In With YouTube": "Sign In With YouTube",
"Log In With YouTube": "Log In With YouTube",
"Cover": "Cover",
"A name is required for your url": "A name is required for your url",
"Create Channel": "Create Channel",

View file

@ -98,7 +98,7 @@ export function CommentCreate(props: Props) {
if (!commentingEnabled) {
return (
<I18nMessage tokens={{ sign_in_link: <Button button="link" requiresAuth label={__('sign in')} /> }}>
<I18nMessage tokens={{ sign_in_link: <Button button="link" requiresAuth label={__('log in')} /> }}>
Please %sign_in_link% to comment.
</I18nMessage>
);

View file

@ -79,7 +79,7 @@ function CommentsReplies(props: Props) {
<div className="comment__actions">
<Button
requiresAuth={IS_WEB}
label={commentingEnabled ? __('Reply') : __('Sign in to reply')}
label={commentingEnabled ? __('Reply') : __('Log in to reply')}
className="comment__action"
onClick={() => setReplying(!isReplying)}
icon={ICONS.REPLY}
@ -122,7 +122,7 @@ function CommentsReplies(props: Props) {
{!isReplying && (
<Button
requiresAuth={IS_WEB}
label={commentingEnabled ? __('Reply') : __('Sign in to reply')}
label={commentingEnabled ? __('Reply') : __('Log in to reply')}
className="comment__action--nested"
onClick={() => setReplying(!isReplying)}
icon={ICONS.REPLY}

View file

@ -381,7 +381,7 @@ const Header = (props: Props) => {
{IS_WEB && !authenticated && (
<div className="header__auth-buttons">
<Button navigate={`/$/${PAGES.AUTH_SIGNIN}`} button="link" label={__('Sign In')} />
<Button navigate={`/$/${PAGES.AUTH_SIGNIN}`} button="link" label={__('Log In')} />
<Button navigate={`/$/${PAGES.AUTH}`} button="primary" label={__('Sign Up')} />
</div>
)}

View file

@ -135,7 +135,7 @@ function PublishAdditionalOptions(props: Props) {
<Button
button="primary"
onClick={signup}
label={__('Sign In With YouTube')}
label={__('Log In With YouTube')}
disabled={false}
/>
) : (

View file

@ -1,4 +1,5 @@
// @flow
import { SITE_NAME } from 'config';
import * as PAGES from 'constants/pages';
import React from 'react';
import CreditAmount from 'component/common/credit-amount';
@ -18,15 +19,16 @@ function RewardAuthIntro(props: Props) {
return (
<Card
title={title || __('Sign In to lbry.tv to Earn Rewards')}
title={title || __('Log in to %SITE_NAME% to Earn Rewards', { SITE_NAME })}
subtitle={
<I18nMessage
tokens={{
credit_amount: <CreditAmount inheritStyle amount={totalRewardRounded} />,
site_name: SITE_NAME,
}}
>
A lbry.tv account allows you to earn more than %credit_amount% in rewards, backup your data, and get content
and security updates.
A %site_name% account allows you to earn more than %credit_amount% in rewards, backup your data, and get
content and security updates.
</I18nMessage>
}
actions={

View file

@ -193,7 +193,7 @@ function SideNavigation(props: Props) {
hideForUnauth?: boolean,
}> = [
{
label: 'Sign In',
label: 'Log In',
navigate: `/$/${PAGES.AUTH_SIGNIN}`,
icon: ICONS.SIGN_IN,
},

View file

@ -63,7 +63,7 @@ function UserEmail(props: Props) {
value={email || ''}
/>
) : (
<Button button="primary" label={__('Sign In')} navigate={`/$/${PAGES.AUTH}`} />
<Button button="primary" label={__('Log In')} navigate={`/$/${PAGES.AUTH}`} />
)
}
/>

View file

@ -152,7 +152,7 @@ function UserEmailNew(props: Props) {
!email || !password || !valid || (!IS_WEB && !localShareUsageData && !shareUsageData) || isPending
}
/>
<Button button="link" onClick={handleChangeToSignIn} label={__('Sign In')} />
<Button button="link" onClick={handleChangeToSignIn} label={__('Log In')} />
</div>
<p className="help--card-actions">
<I18nMessage

View file

@ -1,4 +1,5 @@
// @flow
import { SITE_NAME } from 'config';
import * as PAGES from 'constants/pages';
import React, { useState } from 'react';
import { FormField, Form } from 'component/common/form';
@ -73,7 +74,7 @@ function UserEmailReturning(props: Props) {
<UserEmailVerify />
) : (
<Card
title={__('Sign In to lbry.tv')}
title={__('Log in to %SITE_NAME%', { SITE_NAME })}
actions={
<div>
<Form onSubmit={handleSubmit} className="section">
@ -109,7 +110,7 @@ function UserEmailReturning(props: Props) {
autoFocus={emailExistsFromUrl}
button="primary"
type="submit"
label={__('Sign In')}
label={__('Log In')}
disabled={!email || !valid || isPending}
/>
<Button button="link" onClick={handleChangeToSignIn} label={__('Sign Up')} />
@ -120,7 +121,7 @@ function UserEmailReturning(props: Props) {
nag={
<React.Fragment>
{!emailDoesNotExist && emailExistsFromUrl && (
<Nag type="helpful" relative message={__('That email is already in use. Did you mean to sign in?')} />
<Nag type="helpful" relative message={__('That email is already in use. Did you mean to log in?')} />
)}
{emailDoesNotExist && (
<Nag

View file

@ -66,13 +66,10 @@ class UserEmailVerify extends React.PureComponent<Props> {
title={isReturningUser ? __('Check Your Email') : __('Confirm your account')}
subtitle={
<p>
{__(
'We just sent an email to %email% with a link for you to %verify_text%. Be sure to check any Promotions folders.',
{
{__('We just sent an email to %email% with a link for you to %verify_text%.', {
email,
verify_text: isReturningUser ? __('sign in') : __('verify your account'),
}
)}
verify_text: isReturningUser ? __('log in') : __('verify your account'),
})}
</p>
}
actions={

View file

@ -37,7 +37,7 @@ export default function UserSignInPassword(props: Props) {
) : (
<Card
title={__('Enter Your lbry.tv Password')}
subtitle={__('Signing in as %email%', { email: emailToVerify })}
subtitle={__('Logging in in as %email%', { email: emailToVerify })}
actions={
<Form onSubmit={handleSubmit} className="section">
<FormField

View file

@ -1,4 +1,5 @@
// @flow
import { SITE_NAME } from 'config';
import React from 'react';
import { Modal } from 'modal/modal';
import Button from 'component/button';
@ -34,7 +35,7 @@ const ModalFirstSubscription = (props: Props) => {
{__('Awesome! You just followed your first channel.')}{' '}
{user && user.primary_email
? __('You will receive notifications related to new content.')
: __('Sign in with lbry.tv to receive notifications about new content.')}
: __('Log in with %SITE_NAME% to receive notifications about new content.', { SITE_NAME })}
</>
}
actions={
@ -57,7 +58,7 @@ const ModalFirstSubscription = (props: Props) => {
closeModal();
history.push(`/$/${PAGES.AUTH}?redirect=${pathname}`);
}}
label={__('Sign in')}
label={__('Log in')}
/>
</React.Fragment>
)}

View file

@ -1,4 +1,5 @@
// @flow
import { SITE_NAME } from 'config';
import React from 'react';
import BusyIndicator from 'component/common/busy-indicator';
import InviteNew from 'component/inviteNew';
@ -31,7 +32,9 @@ class InvitePage extends React.PureComponent<Props> {
return (
<Page>
{!authenticated ? (
<RewardAuthIntro title={__('Sign In to lbry.tv to Earn Rewards From Inviting Your Friends')} />
<RewardAuthIntro
title={__('Log In to %SITE_NAME% to Earn Rewards From Inviting Your Friends', { SITE_NAME })}
/>
) : (
<React.Fragment>
{isPending && <BusyIndicator message={__('Checking your invite status')} />}

View file

@ -91,7 +91,7 @@ function SignInVerifyPage(props: Props) {
<Page authPage>
<div className="main__sign-up">
<Card
title={isAuthenticationSuccess ? __('Sign In Success!') : __('Sign In to lbry.tv')}
title={isAuthenticationSuccess ? __('Log in success!') : __('Log in to %SITE_NAME%', { SITE_NAME })}
subtitle={
<React.Fragment>
<p>

View file

@ -67,7 +67,7 @@ function Ads(props: Props) {
sign_in_to_lbrytv: (
<Button
button="link"
label={__('Sign in to') + ' ' + DOMAIN}
label={__('Log in to') + ' ' + DOMAIN}
navigate={`/$/${PAGES.AUTH}?redirect=${pathname}`}
/>
),