From e991e48314c80af244ad37014089de32d73f1c61 Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <jeremy@lbry.io>
Date: Fri, 3 Jan 2020 14:45:34 -0500
Subject: [PATCH] fix i18n on publish, error screen

---
 static/app-strings.json               | 10 ++++------
 ui/component/errorBoundary/view.jsx   | 28 ++++++++++++++++-----------
 ui/component/selectThumbnail/view.jsx | 13 ++++++++-----
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index e4bc7c1dd..6737f2124 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -165,10 +165,6 @@
   "fee": "fee",
   "Find New Tags To Follow": "Find New Tags To Follow",
   "Aw shucks!": "Aw shucks!",
-  "There was an error. It's been reported and will be fixed": "There was an error. It's been reported and will be fixed",
-  "Try": "Try",
-  "refreshing the app": "refreshing the app",
-  "to fix it": "to fix it",
   "Search": "Search",
   "Starting up": "Starting up",
   "Connecting": "Connecting",
@@ -944,5 +940,7 @@
   "Deposit cannot be higher than your balance": "Deposit cannot be higher than your balance",
   "Earn %rewards_link% for inviting your friends. Read our %referral_faq_link% to learn more about referrals.": "Earn %rewards_link% for inviting your friends. Read our %referral_faq_link% to learn more about referrals.",
   "%view_count% Views": "%view_count% Views",
-  "1 View": "1 View"
-}
+  "1 View": "1 View",
+  "There was an error. It's been reported and will be fixed. Try %refreshing_the_app_link% to fix it. If that doesn't work, try pressing Ctrl+R/Cmd+R.": "There was an error. It's been reported and will be fixed. Try %refreshing_the_app_link% to fix it. If that doesn't work, try pressing Ctrl+R/Cmd+R.",
+  "Upload your thumbnail to %speech_link%. Recommended size is 16:9.": "Upload your thumbnail to %speech_link%. Recommended size is 16:9."
+}
\ No newline at end of file
diff --git a/ui/component/errorBoundary/view.jsx b/ui/component/errorBoundary/view.jsx
index 3b80bc231..cbcc3c783 100644
--- a/ui/component/errorBoundary/view.jsx
+++ b/ui/component/errorBoundary/view.jsx
@@ -1,12 +1,13 @@
 // @flow
 import type { Node } from 'react';
-import React, { Fragment } from 'react';
+import React from 'react';
 import Yrbl from 'component/yrbl';
 import Button from 'component/button';
 import { withRouter } from 'react-router';
 import Native from 'native';
 import { Lbry } from 'lbry-redux';
 import analytics from 'analytics';
+import I18nMessage from 'component/i18nMessage';
 
 type Props = {
   children: Node,
@@ -69,16 +70,21 @@ class ErrorBoundary extends React.Component<Props, State> {
             type="sad"
             title={__('Aw shucks!')}
             subtitle={
-              <Fragment>
-                {__("There was an error. It's been reported and will be fixed")}. {__('Try')}{' '}
-                <Button
-                  button="link"
-                  className="load-screen__button"
-                  label={__('refreshing the app')}
-                  onClick={this.refresh}
-                />{' '}
-                {__("to fix it. If that doesn't work, press CMD/CTRL-R to reset to the homepage.")}.
-              </Fragment>
+              <I18nMessage
+                tokens={{
+                  refreshing_the_app_link: (
+                    <Button
+                      button="link"
+                      className="load-screen__button"
+                      label={__('refreshing the app')}
+                      onClick={this.refresh}
+                    />
+                  ),
+                }}
+              >
+                There was an error. It's been reported and will be fixed. Try %refreshing_the_app_link% to fix it. If
+                that doesn't work, try pressing Ctrl+R/Cmd+R.
+              </I18nMessage>
             }
           />
         </div>
diff --git a/ui/component/selectThumbnail/view.jsx b/ui/component/selectThumbnail/view.jsx
index 26bb2dec6..5597d6a77 100644
--- a/ui/component/selectThumbnail/view.jsx
+++ b/ui/component/selectThumbnail/view.jsx
@@ -7,6 +7,7 @@ import FileSelector from 'component/common/file-selector';
 import Button from 'component/button';
 import ThumbnailMissingImage from './thumbnail-missing.png';
 import ThumbnailBrokenImage from './thumbnail-broken.png';
+import I18nMessage from 'component/i18nMessage';
 
 type Props = {
   filePath: ?string,
@@ -172,11 +173,13 @@ class SelectThumbnail extends React.PureComponent<Props, State> {
           {status === THUMBNAIL_STATUSES.API_DOWN ? (
             __('Enter a URL for your thumbnail.')
           ) : (
-            <React.Fragment>
-              {__('Upload your thumbnail to')}{' '}
-              <Button button="link" label={__('spee.ch')} href="https://spee.ch/about" />.{' '}
-              {__('Recommended size is 16:9')}
-            </React.Fragment>
+            <I18nMessage
+              tokens={{
+                speech_link: <Button button="link" label={__('spee.ch')} href="https://spee.ch/about" />,
+              }}
+            >
+              Upload your thumbnail to %speech_link%. Recommended size is 16:9.
+            </I18nMessage>
           )}
         </p>
       </div>