From 35955f067dfb3fedb88b895dca458f7940adfcd9 Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Thu, 4 Mar 2021 16:22:07 +0800 Subject: [PATCH] Add SITE_HELP_EMAIL in strings to ease Odysee string merge and maintenance. --- .env.defaults | 1 + config.js | 1 + static/app-strings.json | 8 ++++---- ui/component/syncFatalError/view.jsx | 5 ++++- ui/component/userSignInPassword/view.jsx | 5 +++-- ui/page/help/view.jsx | 9 +++++---- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.env.defaults b/.env.defaults index 4a7a04d8d..0c56b8598 100644 --- a/.env.defaults +++ b/.env.defaults @@ -21,6 +21,7 @@ THUMBNAIL_CDN_URL=https://image-optimizer.vanwanet.com/?address= SITE_TITLE=lbry.tv SITE_NAME=lbry.tv SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wonderland. +SITE_HELP_EMAIL=help@lbry.com LOGO_TITLE=lbry.tv SIMPLE_SITE=false SHOW_ADS=true diff --git a/config.js b/config.js index f042ad2e0..ab36896fa 100644 --- a/config.js +++ b/config.js @@ -21,6 +21,7 @@ const config = { SITE_TITLE: process.env.SITE_TITLE, SITE_NAME: process.env.SITE_NAME, SITE_DESCRIPTION: process.env.SITE_DESCRIPTION, + SITE_HELP_EMAIL: process.env.SITE_HELP_EMAIL, LOGO_TITLE: process.env.LOGO_TITLE, OG_TITLE_SUFFIX: process.env.OG_TITLE_SUFFIX, OG_HOMEPAGE_TITLE: process.env.OG_HOMEPAGE_TITLE, diff --git a/static/app-strings.json b/static/app-strings.json index 96982d306..cfd921c97 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -491,7 +491,7 @@ "Dark": "Dark", "light": "light", "dark": "dark", - "Live help is available most hours in the %channel% channel of our Discord chat room. Or you can always email us at help@lbry.com.": "Live help is available most hours in the %channel% channel of our Discord chat room. Or you can always email us at help@lbry.com.", + "Live help is available most hours in the %channel% channel of our Discord chat room. Or you can always email us at %help_email%.": "Live help is available most hours in the %channel% channel of our Discord chat room. Or you can always email us at %help_email%.", "Your LBRY Credits, channels, and publishes are controllable by you and only you, via a wallet file stored locally on your computer.": "Your LBRY Credits, channels, and publishes are controllable by you and only you, via a wallet file stored locally on your computer.", "However, it is easy to back up manually. To backup your wallet, make a copy of the folder listed below:": "However, it is easy to back up manually. To backup your wallet, make a copy of the folder listed below:", "Access to these files are equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%.": "Access to these files are equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%.", @@ -561,7 +561,6 @@ "This account must undergo review before you can participate in the rewards program.": "This account must undergo review before you can participate in the rewards program.", "This can take anywhere from several minutes to several days.": "This can take anywhere from several minutes to several days.", "We apologize for this inconvenience, but have added this additional step to prevent fraud.": "We apologize for this inconvenience, but have added this additional step to prevent fraud.", - "If you continue to see this message, send us an email to help@lbry.com.": "If you continue to see this message, send us an email to help@lbry.com.", "Return Home": "Return Home", "Please enjoy free content in the meantime!": "Please enjoy free content in the meantime!", "Claimed Rewards": "Claimed Rewards", @@ -937,7 +936,6 @@ "You have %count% blocked %channels%.": "You have %count% blocked %channels%.", "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", "Enter your %SITE_NAME% password": "Enter your %SITE_NAME% password", "Logging in as %email%": "Logging in as %email%", "Forgot Password?": "Forgot Password?", @@ -1534,8 +1532,10 @@ "Something went wrong with your invite link. You can set and claim your invite reward after signing in.": "Something went wrong with your invite link. You can set and claim your invite reward after signing in.", "Not a valid invite": "Not a valid invite", "Explore": "Explore", + "Under maintenance...": "Under maintenance...", "There is a bug... somewhere": "There is a bug... somewhere", - "Try refreshing to fix the issue. If that doesn't work, email help@lbry.com for support.": "Try refreshing to fix the issue. If that doesn't work, email help@lbry.com for support.", + "We're currently upgrading or rebooting our services, please try refreshing in a few minutes.": "We're currently upgrading or rebooting our services, please try refreshing in a few minutes.", + "Try refreshing to fix the issue. If that doesn't work, email %SITE_HELP_EMAIL% for support.": "Try refreshing to fix the issue. If that doesn't work, email %SITE_HELP_EMAIL% for support.", "Content preview": "Content preview", "Repost url": "Repost url", "Close sidebar - hide channels you are following": "Close sidebar - hide channels you are following", diff --git a/ui/component/syncFatalError/view.jsx b/ui/component/syncFatalError/view.jsx index 5db9e69bd..c5777ffe0 100644 --- a/ui/component/syncFatalError/view.jsx +++ b/ui/component/syncFatalError/view.jsx @@ -4,6 +4,7 @@ import React from 'react'; import Button from 'component/button'; import Yrbl from 'component/yrbl'; import { STATUS_DEGRADED, STATUS_FAILING, STATUS_DOWN } from 'web/effects/use-degraded-performance'; +import { SITE_HELP_EMAIL } from 'config'; type Props = { lbryTvApiStatus: string, @@ -24,7 +25,9 @@ export default function SyncFatalError(props: Props) {

{downTime ? __("We're currently upgrading or rebooting our services, please try refreshing in a few minutes.") - : __("Try refreshing to fix the issue. If that doesn't work, email help@odysee.com for support.")} + : __("Try refreshing to fix the issue. If that doesn't work, email %SITE_HELP_EMAIL% for support.", { + SITE_HELP_EMAIL, + })}

} actions={ diff --git a/ui/component/userSignInPassword/view.jsx b/ui/component/userSignInPassword/view.jsx index 10bea365e..ec12a28ff 100644 --- a/ui/component/userSignInPassword/view.jsx +++ b/ui/component/userSignInPassword/view.jsx @@ -1,4 +1,5 @@ // @flow +import { SITE_NAME } from 'config'; import React, { useState } from 'react'; import { FormField, Form } from 'component/common/form'; import Button from 'component/button'; @@ -36,7 +37,7 @@ export default function UserSignInPassword(props: Props) { ) : ( @@ -48,7 +49,7 @@ export default function UserSignInPassword(props: Props) { autoComplete="on" label={__('Password')} value={password} - onChange={e => setPassword(e.target.value)} + onChange={(e) => setPassword(e.target.value)} helper={