scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-22 23:27:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2394 from paulkaplan/fix-censor-endpoint-shape

Browse source 
Use message instead of censorMessage for the censor message.
This commit is contained in:
Paul Kaplan 2018-12-05 08:31:33 -05:00 committed by GitHub
commit 40795d1cb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/preview/presentation.jsx
View file

@ -127,13 +127,13 @@ const PreviewPresentation = ({
banner = (<Banner banner = (<Banner
actionMessage={<FormattedMessage id="project.share.shareButton" />} actionMessage={<FormattedMessage id="project.share.shareButton" />}
className="banner-danger" className="banner-danger"
message={embedCensorMessage(visibilityInfo.censorMessage)} message={embedCensorMessage(visibilityInfo.message)}
onAction={onShare} onAction={onShare}
/>); />);
} else { } else {
banner = (<Banner banner = (<Banner
className="banner-danger" className="banner-danger"
message={embedCensorMessage(visibilityInfo.censorMessage)} message={embedCensorMessage(visibilityInfo.message)}
/>); />);
} }
} else if (canShare) { } else if (canShare) {
@ -595,7 +595,7 @@ PreviewPresentation.propTypes = {
userOwnsProject: PropTypes.bool, userOwnsProject: PropTypes.bool,
visibilityInfo: PropTypes.shape({ visibilityInfo: PropTypes.shape({
censored: PropTypes.bool, censored: PropTypes.bool,
censorMessage: PropTypes.string, message: PropTypes.string,
deleted: PropTypes.bool, deleted: PropTypes.bool,
reshareable: PropTypes.bool reshareable: PropTypes.bool
}) })

2
src/views/preview/project-view.jsx
View file

@ -649,7 +649,7 @@ Preview.propTypes = {
userPresent: PropTypes.bool, userPresent: PropTypes.bool,
visibilityInfo: PropTypes.shape({ visibilityInfo: PropTypes.shape({
censored: PropTypes.bool, censored: PropTypes.bool,
censorMessage: PropTypes.string, message: PropTypes.string,
deleted: PropTypes.bool, deleted: PropTypes.bool,
reshareable: PropTypes.bool reshareable: PropTypes.bool
}) })