Add SITE_HELP_EMAIL in strings to ease Odysee string merge and maintenance.

.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

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,

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",

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) {
           <p>
             {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,
+                })}
           </p>
         }
         actions={

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) {
         <UserPasswordReset />
       ) : (
         <Card
-          title={__('Enter Your lbry.tv Password')}
+          title={__('Enter your %SITE_NAME% password', { SITE_NAME })}
           subtitle={__('Logging in as %email%', { email: emailToVerify })}
           actions={
             <Form onSubmit={handleSubmit} className="section">
@@ -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={<Button button="link" label={__('Forgot Password?')} onClick={() => setForgotPassword(true)} />}
               />
 

ui/page/help/view.jsx

@@ -2,6 +2,7 @@
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
 import * as React from 'react';
+import { SITE_HELP_EMAIL } from 'config';
 // @if TARGET='app'
 import { shell } from 'electron';
 import WalletBackup from 'component/walletBackup';
@@ -67,12 +68,12 @@ class HelpPage extends React.PureComponent<Props, State> {
     if (!this.props.accessToken) this.props.fetchAccessToken();
     // @endif
 
-    Lbry.version().then(info => {
+    Lbry.version().then((info) => {
       this.setState({
         versionInfo: info,
       });
     });
-    Lbry.status().then(info => {
+    Lbry.status().then((info) => {
       this.setState({
         lbryId: info.installation_id,
       });
@@ -151,9 +152,9 @@ class HelpPage extends React.PureComponent<Props, State> {
         <Card
           title={__('Find assistance')}
           subtitle={
-            <I18nMessage tokens={{ channel: <strong>#help</strong> }}>
+            <I18nMessage tokens={{ channel: <strong>#help</strong>, help_email: SITE_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@lbry.com.
+              email us at %help_email%.
             </I18nMessage>
           }
           actions={