From 201417efcf9076bc04304966c8410c676c4a54cc Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 23 Jul 2020 13:02:07 -0400 Subject: [PATCH] Publish => Upload --- static/app-strings.json | 23 ++++++++----------- ui/component/claimPreviewSubtitle/index.js | 7 ++---- ui/component/claimPreviewSubtitle/view.jsx | 2 +- ui/component/common/file-selector.jsx | 18 ++------------- ui/component/creatorAnalytics/view.jsx | 16 ++++++------- ui/component/fileActions/view.jsx | 2 +- ui/component/fileDrop/view.jsx | 2 +- ui/component/header/view.jsx | 8 +++---- ui/component/publishFile/view.jsx | 18 +++++++-------- ui/component/publishForm/view.jsx | 2 +- ui/component/router/view.jsx | 8 +++---- ui/component/sideNavigation/view.jsx | 4 ++-- .../internal/txo-list-item.jsx | 2 +- ui/constants/pages.js | 6 +++-- ui/modal/modalFileSelection/view.jsx | 2 +- ui/modal/modalPublish/view.jsx | 3 ++- ui/page/fileListPublished/view.jsx | 13 ++++++----- ui/page/publish/view.jsx | 2 +- ui/page/settingsNotifications/view.jsx | 2 +- ui/redux/actions/publish.js | 4 ++-- ui/rewards.js | 4 ++-- 21 files changed, 64 insertions(+), 84 deletions(-) diff --git a/static/app-strings.json b/static/app-strings.json index 56fe5b6be..8b83948a6 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -69,7 +69,6 @@ "Malay": "Malay", "By continuing, you accept the %lbry_terms_of_service%.": "By continuing, you accept the %lbry_terms_of_service%.", "LBRY Terms of Service": "LBRY Terms of Service", - "Choose File": "Choose File", "No File Chosen": "No File Chosen", "Choose Thumbnail": "Choose Thumbnail", "Enter a thumbnail URL": "Enter a thumbnail URL", @@ -173,7 +172,6 @@ "Autoplay video and audio files when navigating to a file, as well as the next related item when a file finishes playing.": "Autoplay video and audio files when navigating to a file, as well as the next related item when a file finishes playing.", "Application Cache": "Application Cache", "Clear Cache": "Clear Cache", - "Choose Directory": "Choose Directory", "Currency": "Currency", "LBRY Credits (LBC)": "LBRY Credits (LBC)", "US Dollars": "US Dollars", @@ -282,7 +280,7 @@ "Facebook": "Facebook", "Twitter": "Twitter", "Done": "Done", - "You can't publish things quite yet": "You can't publish things quite yet", + "You can't upload things quite yet": "You can't upload things quite yet", "LBRY uses a blockchain, which is a fancy way of saying that users (you) are in control of your data.": "LBRY uses a blockchain, which is a fancy way of saying that users (you) are in control of your data.", "Because of the blockchain, some actions require LBRY credits": "Because of the blockchain, some actions require LBRY credits", "allows you to do some neat things, like paying your favorite creators for their content. And no company can stop you.": "allows you to do some neat things, like paying your favorite creators for their content. And no company can stop you.", @@ -295,14 +293,13 @@ "Checking the winning claim amount...": "Checking the winning claim amount...", "The better the tags, the easier your content is to find.": "The better the tags, the easier your content is to find.", "You aren't following any tags, try searching for one.": "You aren't following any tags, try searching for one.", - "Publishing...": "Publishing...", "Success": "Success", "File published": "File published", "You are currently editing a claim.": "You are currently editing a claim.", "You are currently editing this claim. If you change the URL, you will need to reselect a file.": "You are currently editing this claim. If you change the URL, you will need to reselect a file.", "However, you can get a longer version of this URL for any bid": "However, you can get a longer version of this URL for any bid", "It looks like you haven't published anything to LBRY yet.": "It looks like you haven't published anything to LBRY yet.", - "Publish something new": "Publish something new", + "Upload something new": "Upload something new", "New thumbnail": "New thumbnail", "Follow": "Follow", "Claim sequence must be a number.": "Claim sequence must be a number.", @@ -440,7 +437,7 @@ "Redeem": "Redeem", "Code": "Code", "Nothing here": "Nothing here", - "Publish something and claim this spot!": "Publish something and claim this spot!", + "Upload something and claim this spot!": "Upload something and claim this spot!", "Currently, there is no automatic backup. If you lose access to these files, you will lose your credits, channels, and publishes.": "Currently, there is no automatic backup. If you lose access to these files, you will lose your credits, channels, and publishes.", "File Size": "File Size", "You deposited 1 LBC as a support!": "You deposited 1 LBC as a support!", @@ -522,7 +519,7 @@ "... in your publishes": "... in your publishes", "... in your supports": "... in your supports", "Add a tag": "Add a tag", - "Publish something totally wacky and wild.": "Publish something totally wacky and wild.", + "Upload something totally wacky and wild.": "Upload something totally wacky and wild.", "Available Rewards": "Available Rewards", "Nothing published to LBRY yet.": "Nothing published to LBRY yet.", "Follow New Tags": "Follow New Tags", @@ -746,7 +743,7 @@ "This Year": "This Year", "Khmer": "Khmer", "Invites": "Invites", - "This is an experiment, and may be removed in the future. Publish something with the #homepagecagematch tag to battle for the top spot on the home page!": "This is an experiment, and may be removed in the future. Publish something with the #homepagecagematch tag to battle for the top spot on the home page!", + "This is an experiment, and may be removed in the future. Upload something with the #homepagecagematch tag to battle for the top spot on the home page!": "This is an experiment, and may be removed in the future. Upload something with the #homepagecagematch tag to battle for the top spot on the home page!", "Publishing": "Publishing", "Update published": "Update published", "Delete this file from my computer": "Delete this file from my computer", @@ -848,7 +845,7 @@ "%selectTagsLabel% (%number% left)": "%selectTagsLabel% (%number% left)", "Matching": "Matching", "Please check your deposit amount.": "Please check your deposit amount.", - "Publishing Guide": "Publishing Guide", + "Upload Guide": "Upload Guide", "This is equivalent to a password. Do not post or share this.": "This is equivalent to a password. Do not post or share this.", "Your video may not be the best format. Use MP4s in H264/AAC format and a friendly bitrate (720p) for more reliable streaming.": "Your video may not be the best format. Use MP4s in H264/AAC format and a friendly bitrate (720p) for more reliable streaming.", "Transcoding": "Transcoding", @@ -923,9 +920,9 @@ "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 published anything with this channel yet!": "You haven't published anything with this channel yet!", + "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!", - "Publish Something": "Publish Something", + "Upload Something": "Upload Something", "Amount cannot be zero": "Amount cannot be zero", "Your content will do better with more staked on it": "Your content will do better with more staked on it", "She's about to close up the library!": "She's about to close up the library!", @@ -992,7 +989,7 @@ "%lbc_received_changed% this week": "%lbc_received_changed% this week", "Earnings may also include any LBC you've sent yourself or added as support. We are working on making this more accurate. Check your wallet page for the correct total balance.": "Earnings may also include any LBC you've sent yourself or added as support. We are working on making this more accurate. Check your wallet page for the correct total balance.", "Your Recent Content": "Your Recent Content", - "No recent publishes found for this channel. Publish something new and track how it's performing here.": "No recent publishes found for this channel. Publish something new and track how it's performing here.", + "No recent uploads found for this channel. Upload something new and track how it's performing here.": "No recent uploads found for this channel. Upload something new and track how it's performing here.", "Most Viewed Content": "Most Viewed Content", "%all_time_top_views% views - %all_time_views_weekly_change% this week": "%all_time_top_views% views - %all_time_views_weekly_change% this week", "Successfully abandoned your support.": "Successfully abandoned your support.", @@ -1220,7 +1217,7 @@ "We can't find that email. Did you mean to register?": "We can't find that email. Did you mean to register?", "App Notifications": "App Notifications", "Notification settings for the desktop app.": "Notification settings for the desktop app.", - "Get notified when a publish or channel is confirmed.": "Get notified when a publish or channel is confirmed.", + "Get notified when an upload or channel is confirmed.": "Get notified when an upload or channel is confirmed.", "Email Preferences": "Email Preferences", "Opt out of any topics you don't want to receive email about.": "Opt out of any topics you don't want to receive email about.", "Uncheck your email below if you want to stop receiving messages.": "Uncheck your email below if you want to stop receiving messages.", diff --git a/ui/component/claimPreviewSubtitle/index.js b/ui/component/claimPreviewSubtitle/index.js index b46f46880..78a458c07 100644 --- a/ui/component/claimPreviewSubtitle/index.js +++ b/ui/component/claimPreviewSubtitle/index.js @@ -13,11 +13,8 @@ const perform = dispatch => ({ beginPublish: name => { dispatch(doClearPublish()); dispatch(doPrepareEdit({ name })); - dispatch(push(`/$/${PAGES.PUBLISH}`)); + dispatch(push(`/$/${PAGES.UPLOAD}`)); }, }); -export default connect( - select, - perform -)(ClaimPreviewSubtitle); +export default connect(select, perform)(ClaimPreviewSubtitle); diff --git a/ui/component/claimPreviewSubtitle/view.jsx b/ui/component/claimPreviewSubtitle/view.jsx index 131b33eb0..830026040 100644 --- a/ui/component/claimPreviewSubtitle/view.jsx +++ b/ui/component/claimPreviewSubtitle/view.jsx @@ -34,7 +34,7 @@ function ClaimPreviewSubtitle(props: Props) { ) : ( -
{__('Publish something and claim this spot!')}
+
{__('Upload something and claim this spot!')}
diff --git a/ui/component/common/file-selector.jsx b/ui/component/common/file-selector.jsx index 3dbba4780..ea298efc8 100644 --- a/ui/component/common/file-selector.jsx +++ b/ui/component/common/file-selector.jsx @@ -10,8 +10,6 @@ type Props = { onFileChosen: WebFile => void, label?: string, placeholder?: string, - fileLabel?: string, - directoryLabel?: string, accept?: string, error?: string, disabled?: boolean, @@ -63,19 +61,7 @@ class FileSelector extends React.PureComponent { input: ?HTMLInputElement; render() { - const { - type, - currentPath, - label, - fileLabel, - directoryLabel, - placeholder, - accept, - error, - disabled, - autoFocus = false, - } = this.props; - const buttonLabel = type === 'file' ? fileLabel || __('Choose File') : directoryLabel || __('Choose Directory'); + const { type, currentPath, label, placeholder, accept, error, disabled, autoFocus = false } = this.props; const placeHolder = currentPath || placeholder; return ( @@ -95,7 +81,7 @@ class FileSelector extends React.PureComponent { button="secondary" disabled={disabled} onClick={this.fileInputButton} - label={buttonLabel} + label={__('Browse')} /> } /> diff --git a/ui/component/creatorAnalytics/view.jsx b/ui/component/creatorAnalytics/view.jsx index ef3486552..52aa2796d 100644 --- a/ui/component/creatorAnalytics/view.jsx +++ b/ui/component/creatorAnalytics/view.jsx @@ -85,17 +85,17 @@ export default function CreatorAnalytics(props: Props) { { if (claim) { prepareEdit(claim.name); - history.push(`/$/${PAGES.PUBLISH}`); + history.push(`/$/${PAGES.UPLOAD}`); } }} /> @@ -193,20 +193,18 @@ export default function CreatorAnalytics(props: Props) { title={__('Your Recent Content')} subtitle={ !stats.VideoURITopNew && - __( - "No recent publishes found for this channel. Publish something new and track how it's performing here." - ) + __("No recent uploads found for this channel. Upload something new and track how it's performing here.") } actions={
@@ -96,12 +97,12 @@ function FileListPublished(props: Props) { {!fetching ? (
-

{__('Nothing published to LBRY yet.')}

+

{__('Nothing uploaded to LBRY yet.')}

diff --git a/ui/page/publish/view.jsx b/ui/page/publish/view.jsx index 85a7cba40..2a6f00370 100644 --- a/ui/page/publish/view.jsx +++ b/ui/page/publish/view.jsx @@ -34,7 +34,7 @@ function PublishPage(props: Props) {

diff --git a/ui/page/settingsNotifications/view.jsx b/ui/page/settingsNotifications/view.jsx index b59abf9a8..cdacd2886 100644 --- a/ui/page/settingsNotifications/view.jsx +++ b/ui/page/settingsNotifications/view.jsx @@ -127,7 +127,7 @@ export default function NotificationSettingsPage(props: Props) { onChange={() => setClientSetting(SETTINGS.OS_NOTIFICATIONS_ENABLED, !osNotificationsEnabled)} checked={osNotificationsEnabled} label={__('Show Desktop Notifications')} - helper={__('Get notified when a publish or channel is confirmed.')} + helper={__('Get notified when an upload or channel is confirmed.')} /> } /> diff --git a/ui/redux/actions/publish.js b/ui/redux/actions/publish.js index c884c54d4..8a0435d98 100644 --- a/ui/redux/actions/publish.js +++ b/ui/redux/actions/publish.js @@ -25,7 +25,7 @@ export const doPublishDesktop = (filePath: string) => (dispatch: Dispatch, getSt const actions = []; // @if TARGET='app' - actions.push(push(`/$/${PAGES.PUBLISHED}`)); + actions.push(push(`/$/${PAGES.UPLOADS}`)); // @endif actions.push({ @@ -78,7 +78,7 @@ export const doPublishDesktop = (filePath: string) => (dispatch: Dispatch, getSt // on the publishes page. This doesn't exist on desktop so wait until we get a response // from the SDK // @if TARGET='web' - dispatch(push(`/$/${PAGES.PUBLISHED}`)); + dispatch(push(`/$/${PAGES.UPLOADS}`)); // @endif dispatch(doPublish(publishSuccess, publishFail)); diff --git a/ui/rewards.js b/ui/rewards.js index f026f9fa3..c3c91696b 100644 --- a/ui/rewards.js +++ b/ui/rewards.js @@ -95,9 +95,9 @@ rewards.claimReward = (type, rewardParams) => { reject( claims.length ? new Error( - __('Please publish something and wait for confirmation by the network to claim this reward.') + __('Please upload something and wait for confirmation by the network to claim this reward.') ) - : new Error(__('Please publish something to claim this reward.')) + : new Error(__('Please upload something to claim this reward.')) ); } })