Odysee specific changes and other misc improvements (#219)

This commit is contained in:
Thomas Zarebczan 2021-11-03 15:47:19 -04:00 committed by GitHub
parent 6d8e265f50
commit db12a4b991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 43 additions and 46 deletions

View file

@ -446,7 +446,7 @@ function App(props: Props) {
{IS_WEB && lbryTvApiStatus === STATUS_DOWN ? ( {IS_WEB && lbryTvApiStatus === STATUS_DOWN ? (
<Yrbl <Yrbl
className="main--empty" className="main--empty"
title={__('lbry.tv is currently down')} title={__('odysee.com is currently down')}
subtitle={__('My wheel broke, but the good news is that someone from LBRY is working on it.')} subtitle={__('My wheel broke, but the good news is that someone from LBRY is working on it.')}
/> />
) : ( ) : (

View file

@ -94,7 +94,7 @@ function ChannelAbout(props: Props) {
<div className="media__info-text media__info-text--constrained">{claim.claim_id}</div> <div className="media__info-text media__info-text--constrained">{claim.claim_id}</div>
</div> </div>
<label>{__('Staked LBRY Credits')}</label> <label>{__('Staked Credits')}</label>
<div className="media__info-text"> <div className="media__info-text">
<CreditAmount <CreditAmount
badge={false} badge={false}

View file

@ -112,7 +112,7 @@ class ClaimLink extends React.Component<Props> {
) : ( ) : (
<Button <Button
button="link" button="link"
title={SIMPLE_SITE ? __("This channel isn't staking enough LBRY Credits for link previews.") : children} title={SIMPLE_SITE ? __("This channel isn't staking enough Credits for link previews.") : children}
label={children} label={children}
className="button--external-link" className="button--external-link"
navigate={uri} navigate={uri}

View file

@ -268,13 +268,10 @@ export function CommentCreate(props: Props) {
}, 1500); }, 1500);
doToast({ doToast({
message: __( message: __("You sent %tipAmount% Credits as a tip to %tipChannelName%, I'm sure they appreciate it!", {
"You sent %tipAmount% LBRY Credits as a tip to %tipChannelName%, I'm sure they appreciate it!", tipAmount: tipAmount, // force show decimal places
{ tipChannelName,
tipAmount: tipAmount, // force show decimal places }),
tipChannelName,
}
),
}); });
setSuccessTip({ txid, tipAmount }); setSuccessTip({ txid, tipAmount });

View file

@ -21,7 +21,7 @@ export default function FileRenderDownload(props: Props) {
subtitle={ subtitle={
<p> <p>
{__( {__(
'This content can be downloaded from lbry.tv, but not displayed. It will display in LBRY Desktop, an app for desktop computers.' 'This content can be downloaded from odysee.com, but not displayed. It will display in LBRY Desktop, an app for desktop computers.'
)} )}
</p> </p>
} }

View file

@ -80,7 +80,7 @@ class FileValues extends PureComponent<Props> {
<td> <td>
<div> <div>
{__('Total Staked Amount')} {__('Total Staked Amount')}
<HelpLink href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3" /> <HelpLink href="https://odysee.com/@OdyseeHelp:b/trending:50" />
</div> </div>
</td> </td>
<td> <td>
@ -90,7 +90,7 @@ class FileValues extends PureComponent<Props> {
<tr> <tr>
<td> <td>
{__('Community Choice?')} {__('Community Choice?')}
<HelpLink href="https://lbry.com/faq/naming" /> <HelpLink href="https://odysee.com/@OdyseeHelp:b/trending:50" />
</td> </td>
<td> <td>
<Button <Button

View file

@ -96,12 +96,12 @@ function PrivacyAgreement(props: Props) {
checked={share === LIMITED} checked={share === LIMITED}
label={ label={
<> <>
{__('Yes, but only with LBRY, Inc.')} <span>🙂</span> {__('Yes, but only with Odysee, Inc.')} <span>🙂</span>
</> </>
} }
helper={__( helper={__(
`Sharing information with LBRY, Inc. allows us to report to publishers how their content is doing, as `Sharing information with Odysee, Inc. allows us to report to publishers how their content is doing, as
well as track basic usage and performance. This is the minimum required to earn rewards from LBRY, Inc.` well as track basic usage and performance. This is the minimum required to earn rewards from Odysee, Inc.`
)} )}
onChange={(e) => setShare(LIMITED)} onChange={(e) => setShare(LIMITED)}
/> />
@ -115,7 +115,7 @@ function PrivacyAgreement(props: Props) {
{__('No')} <span>😢</span> {__('No')} <span>😢</span>
</> </>
} }
helper={__(`No information will be sent directly to LBRY, Inc. or third-parties about your usage. Note that as helper={__(`No information will be sent directly to Odysee Inc. or third-parties about your usage. Note that as
peer-to-peer software, your IP address and potentially other system information can be sent to other peer-to-peer software, your IP address and potentially other system information can be sent to other
users, though this information is not stored permanently.`)} users, though this information is not stored permanently.`)}
onChange={(e) => setShare(NONE)} onChange={(e) => setShare(NONE)}
@ -128,7 +128,7 @@ function PrivacyAgreement(props: Props) {
signout_button: <Button button="link" label={__('Sign Out')} onClick={signOut} />, signout_button: <Button button="link" label={__('Sign Out')} onClick={signOut} />,
}} }}
> >
You are signed into lbry.tv which automatically shares data with LBRY inc. %signout_button%. You are signed into odysee.com which automatically shares data with LBRY inc. %signout_button%.
</I18nMessage> </I18nMessage>
</p> </p>
</div> </div>

View file

@ -52,9 +52,7 @@ function PublishFormErrors(props: Props) {
) : ( ) : (
thumbnailError && !thumbnailUploaded && <div>{__('Thumbnail is invalid.')}</div> thumbnailError && !thumbnailUploaded && <div>{__('Thumbnail is invalid.')}</div>
)} )}
{editingURI && !isStillEditing && !filePath && ( {editingURI && !isStillEditing && !filePath && <div>{__('Please reselect a file after changing the URL')}</div>}
<div>{__('Please reselect a file after changing the LBRY URL')}</div>
)}
</div> </div>
); );
} }

View file

@ -84,8 +84,8 @@ export default function SearchTopClaim(props: Props) {
<div className="claim-preview__actions--header"> <div className="claim-preview__actions--header">
<a <a
className="media__uri" className="media__uri"
href="https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c" href="https://odysee.com/@OdyseeHelp:b/trending:50"
title={__('Learn more about LBRY Credits on %DOMAIN%', { DOMAIN })} title={__('Learn more about Credits on %DOMAIN%', { DOMAIN })}
> >
<LbcSymbol prefix={__('Most supported')} /> <LbcSymbol prefix={__('Most supported')} />
</a> </a>

View file

@ -10,7 +10,7 @@ import Card from 'component/common/card';
type Props = { type Props = {
cancelButton: Node, cancelButton: Node,
email: string, email: string,
resendVerificationEmail: string => void, resendVerificationEmail: (string) => void,
checkEmailVerified: () => void, checkEmailVerified: () => void,
user: { user: {
has_verified_email: boolean, has_verified_email: boolean,
@ -35,12 +35,12 @@ function UserEmail(props: Props) {
return ( return (
<Card <Card
title={__('lbry.tv Account')} title={__('odysee.com Account')}
subtitle={ subtitle={
isVerified isVerified
? undefined ? undefined
: __( : __(
'Creating a lbry.tv account will allow you to earn rewards, receive content and security updates, and optionally backup your data.' 'Creating a odysee.com account will allow you to earn rewards, receive content and security updates, and optionally backup your data.'
) )
} }
actions={ actions={

View file

@ -151,7 +151,7 @@ class UserVerify extends React.PureComponent<Props> {
<p>{__('You will be asked to provide proof of identity.')}</p> <p>{__('You will be asked to provide proof of identity.')}</p>
</> </>
} }
actions={<Button href="https://chat.lbry.com" button="primary" label={__('Join LBRY Chat')} />} actions={<Button href="https://chat.lbry.com" button="primary" label={__('Join the Foundation Chat')} />}
/> />
<div className="section__divider"> <div className="section__divider">

View file

@ -89,9 +89,7 @@ class WalletSend extends React.PureComponent<Props> {
<Card <Card
title={__('Send Credits')} title={__('Send Credits')}
subtitle={ subtitle={
<I18nMessage tokens={{ lbc: <LbcSymbol /> }}> <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>Send Credits to your friends or favorite creators.</I18nMessage>
Send LBRY Credits to your friends or favorite creators.
</I18nMessage>
} }
actions={ actions={
<Formik <Formik

View file

@ -16,7 +16,7 @@ export const LEVEL_3_STAKED_AMOUNT = 50;
export const LEVEL_4_STAKED_AMOUNT = 250; export const LEVEL_4_STAKED_AMOUNT = 250;
export const LEVEL_5_STAKED_AMOUNT = 1000; export const LEVEL_5_STAKED_AMOUNT = 1000;
export const INVALID_NAME_ERROR = export const INVALID_NAME_ERROR =
__('LBRY names cannot contain spaces or reserved symbols') + ' ' + '(?$#@;:/\\="<>%{}|^~[]`)'; __('names cannot contain spaces or reserved symbols') + ' ' + '(?$#@;:/\\="<>%{}|^~[]`)';
export const FORCE_CONTENT_TYPE_PLAYER = [ export const FORCE_CONTENT_TYPE_PLAYER = [
'video/quicktime', 'video/quicktime',

View file

@ -1,2 +1,2 @@
export const ALREADY_CLAIMED = 'once the invite reward has been claimed the referrer cannot be changed'; export const ALREADY_CLAIMED = 'once the invite reward has been claimed the referrer cannot be changed';
export const REFERRER_NOT_FOUND = 'A lbry.tv account could not be found for the referrer you provided.'; export const REFERRER_NOT_FOUND = 'A odysee account could not be found for the referrer you provided.';

View file

@ -52,7 +52,7 @@ class ModalError extends React.PureComponent<Props> {
<Modal isOpen contentLabel={__('Error')} title={__('Error')} className="error-modal" onConfirmed={closeModal}> <Modal isOpen contentLabel={__('Error')} title={__('Error')} className="error-modal" onConfirmed={closeModal}>
<p> <p>
{__( {__(
"We're sorry that LBRY has encountered an error. This has been reported and we will investigate the problem." "We're sorry that Odysee has encountered an error. Please try again or reach out to hello@odysee.com with detailed information."
)} )}
</p> </p>
<ul className="error-modal__error-list ul--no-style">{errorInfoList}</ul> <ul className="error-modal__error-list ul--no-style">{errorInfoList}</ul>

View file

@ -59,7 +59,7 @@ function ModalOpenExternalResource(props: Props) {
(path && __('This file has been shared with you by other people.'))} (path && __('This file has been shared with you by other people.'))}
</p> </p>
<blockquote>{uri || path}</blockquote> <blockquote>{uri || path}</blockquote>
<p>{__('LBRY Inc is not responsible for its content, click continue to proceed at your own risk.')}</p> <p>{__('Odysee is not responsible for its content, click continue to proceed at your own risk.')}</p>
</Modal> </Modal>
); );
} }

View file

@ -66,7 +66,7 @@ class ModalSetReferrer extends React.PureComponent<Props, State> {
title={__('Enter inviter')} title={__('Enter inviter')}
subtitle={ subtitle={
<React.Fragment> <React.Fragment>
{__('Did someone invite you to use lbry.tv? Tell us who and you both get a reward!')} {__('Did someone invite you to use Odysee? Tell us who and you both get a reward!')}
<HelpLink href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3" /> <HelpLink href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3" />
</React.Fragment> </React.Fragment>
} }

View file

@ -83,8 +83,8 @@ function DiscoverPage(props: Props) {
return !dynamicRouteProps ? ( return !dynamicRouteProps ? (
<a <a
className="help" className="help"
href="https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c" href="https://odysee.com/@OdyseeHelp:b/trending:50"
title={__('Learn more about LBRY Credits on %DOMAIN%', { DOMAIN })} title={__('Learn more about Credits on %DOMAIN%', { DOMAIN })}
> >
<I18nMessage <I18nMessage
tokens={{ tokens={{

View file

@ -174,7 +174,12 @@ class HelpPage extends React.PureComponent<Props, State> {
} }
actions={ actions={
<div className="section__actions"> <div className="section__actions">
<Button button="secondary" label={__('Join Our Chat')} icon={ICONS.CHAT} href="https://chat.lbry.com" /> <Button
button="secondary"
label={__('Join the Foundation Chat')}
icon={ICONS.CHAT}
href="https://chat.lbry.com"
/>
<Button button="secondary" label={__('Email Us')} icon={ICONS.WEB} href={`mailto:${SITE_HELP_EMAIL}`} /> <Button button="secondary" label={__('Email Us')} icon={ICONS.WEB} href={`mailto:${SITE_HELP_EMAIL}`} />
</div> </div>
} }
@ -184,7 +189,7 @@ class HelpPage extends React.PureComponent<Props, State> {
title={__('Report a bug or suggest something')} title={__('Report a bug or suggest something')}
subtitle={ subtitle={
<React.Fragment> <React.Fragment>
{__('Did you find something wrong? Think LBRY could add something useful and cool?')} {__('Did you find something wrong? Think Odysee could add something useful and cool?')}
</React.Fragment> </React.Fragment>
} }
actions={ actions={

View file

@ -242,7 +242,7 @@ export default function LivestreamSetupPage(props: Props) {
className="livestream__publish-intro" className="livestream__publish-intro"
title={__('No livestream publishes found')} title={__('No livestream publishes found')}
subtitle={__( subtitle={__(
'You need to upload your livestream details before you can go live. If you already created one in this channel, it should appear soon.' 'You need to upload your livestream details before you can go live. Please note: Replays must be published manually after your stream via the Update button on the livestream.'
)} )}
actions={ actions={
<div className="section__actions"> <div className="section__actions">

View file

@ -124,7 +124,7 @@ export default function YoutubeSync(props: Props) {
{nameError ? ( {nameError ? (
<span className="error__text">{nameError}</span> <span className="error__text">{nameError}</span>
) : ( ) : (
__('Your %site_name% channel name', { site_name: IS_WEB ? SITE_NAME : 'LBRY' }) __('Your %site_name% desired channel name', { site_name: IS_WEB ? SITE_NAME : 'LBRY' })
)} )}
</label> </label>
<div className="form-field__prefix">@</div> <div className="form-field__prefix">@</div>
@ -206,9 +206,8 @@ export default function YoutubeSync(props: Props) {
), ),
}} }}
> >
This will verify you are an active YouTuber. Channel names cannot be changed once chosen, please be This will verify you are an active YouTuber with over 300 subscribers and original content. Channel
extra careful. Additional instructions will be emailed to you after you verify your email on the names cannot be changed once chosen, please be extra careful. %learn_more%.
next page. %learn_more%.
</I18nMessage> </I18nMessage>
</div> </div>
</Form> </Form>

View file

@ -29,7 +29,7 @@ export default function NagDegradedPerformance(props: Props) {
), ),
}} }}
> >
lbry.tv collects usage information for itself only (%more_information%). odysee collects usage information for itself only (%more_information%).
</I18nMessage> </I18nMessage>
} }
actionText={__('OK')} actionText={__('OK')}
@ -49,7 +49,7 @@ export default function NagDegradedPerformance(props: Props) {
), ),
}} }}
> >
lbry.tv collects usage information for itself only (%more_information%). Want control over this and more? odysee collects usage information for itself only (%more_information%). Want control over this and more?
</I18nMessage> </I18nMessage>
} }
actionText={__('Get The App')} actionText={__('Get The App')}