random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
mgabdev
2020-03-04 17:50:15 -05:00
parent 198fe127a0
commit d31d5fcd81
75 changed files with 806 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/gabsocial/components/modal/boost_modal.js
View File

@@ -9,8 +9,8 @@ import DisplayName from '../display_name';
import Icon from '../icon';
const messages = defineMessages({
cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Un-repost' },
reblog: { id: 'status.reblog', defaultMessage: 'Repost' },
cancel_repost: { id: 'status.cancel_repost_private', defaultMessage: 'Un-repost' },
repost: { id: 'status.repost', defaultMessage: 'Repost' },
combo: { id: 'boost_modal.combo', defaultMessage: 'You can press {combo} to skip this next time' },
});
@@ -60,7 +60,7 @@ class BoostModal extends ImmutablePureComponent {
render () {
const { status, intl } = this.props;
const buttonText = status.get('reblogged') ? messages.cancel_reblog : messages.reblog;
const buttonText = status.get('reblogged') ? messages.cancel_repost : messages.repost;
const statusUrl = `/${status.getIn(['account', 'acct'])}/posts/${status.get('url')}`;

2
app/javascript/gabsocial/components/popover/status_options_popover.js
View File

@@ -12,7 +12,7 @@ export default class StatusOptionsPopover extends PureComponent {
// menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
// } else {
// if (status.get('visibility') === 'private') {
// menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog_private : messages.reblog_private), action: this.handleRepostClick });
// menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_repost_private : messages.repost_private), action: this.handleRepostClick });
// }
// }

4
app/javascript/gabsocial/components/status/status.js
View File

@@ -340,7 +340,7 @@ class Status extends ImmutablePureComponent {
<Icon id='retweet' className='status__prepend-icon' fixedWidth />
</div>
{/*<FormattedMessage
id='status.reblogged_by'
id='status.reposted_by'
defaultMessage='{name} reposted'
values={{
name: (
@@ -356,7 +356,7 @@ class Status extends ImmutablePureComponent {
);
rebloggedByText = intl.formatMessage(
{ id: 'status.reblogged_by', defaultMessage: '{name} reposted' },
{ id: 'status.reposted_by', defaultMessage: '{name} reposted' },
{ name: status.getIn(['account', 'acct']) }
);

20
app/javascript/gabsocial/components/status_action_bar/status_action_bar.js
View File

@@ -20,11 +20,11 @@ const messages = defineMessages({
more: { id: 'status.more', defaultMessage: 'More' },
share: { id: 'status.share', defaultMessage: 'Share' },
replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
reblog: { id: 'status.reblog', defaultMessage: 'Repost' },
repost: { id: 'repost', defaultMessage: 'Repost' },
quote: { id: 'status.quote', defaultMessage: 'Quote' },
reblog_private: { id: 'status.reblog_private', defaultMessage: 'Repost to original audience' },
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Un-repost' },
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be reposted' },
repost_private: { id: 'status.repost_private', defaultMessage: 'Repost to original audience' },
cancel_repost_private: { id: 'status.cancel_repost_private', defaultMessage: 'Un-repost' },
cannot_repost: { id: 'status.cannot_repost', defaultMessage: 'This post cannot be reposted' },
cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
like: { id: 'status.like', defaultMessage: 'Like' },
open: { id: 'status.open', defaultMessage: 'Expand this status' },
@@ -126,8 +126,8 @@ class StatusActionBar extends ImmutablePureComponent {
const replyIcon = (status.get('in_reply_to_id', null) === null) ? 'reply' : 'reply-all'
const replyTitle = (status.get('in_reply_to_id', null) === null) ? formatMessage(messages.reply) : formatMessage(messages.replyAll)
const reblogCount = status.get('reblogs_count')
const reblogTitle = !publicStatus ? formatMessage(messages.cannot_reblog) : formatMessage(messages.reblog)
const repostCount = status.get('reblogs_count')
const repostTitle = !publicStatus ? formatMessage(messages.cannot_repost) : formatMessage(messages.repost)
const favoriteCount = status.get('favorites_count') // : todo :
@@ -149,7 +149,7 @@ class StatusActionBar extends ImmutablePureComponent {
onClick: this.handleReplyClick,
},
{
title: reblogTitle,
title: repostTitle,
icon: (status.get('visibility') === 'private') ? 'lock' : 'repost',
disabled: !publicStatus,
active: !!status.get('reblogged'),
@@ -163,7 +163,7 @@ class StatusActionBar extends ImmutablePureComponent {
},
]
const hasInteractions = favoriteCount > 0 || replyCount > 0 || reblogCount > 0
const hasInteractions = favoriteCount > 0 || replyCount > 0 || repostCount > 0
const shouldCondense = (!!status.get('card') || status.get('media_attachments').size > 0) && !hasInteractions
const containerClasses = cx({
@@ -211,9 +211,9 @@ class StatusActionBar extends ImmutablePureComponent {
&nbsp;Comments
</button>
}
{reblogCount > 0 &&
{repostCount > 0 &&
<button className={interactionBtnClasses}>
{reblogCount}
{repostCount}
&nbsp;Reposts
</button>
}

2
app/javascript/gabsocial/components/status_header.js
View File

@@ -122,7 +122,7 @@ export default class StatusHeader extends ImmutablePureComponent {
menu.push({ text: formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
} else {
if (status.get('visibility') === 'private') {
menu.push({ text: formatMessage(status.get('reblogged') ? messages.cancel_reblog_private : messages.reblog_private), action: this.handleRepostClick });
menu.push({ text: formatMessage(status.get('reblogged') ? messages.cancel_repost_private : messages.repost_private), action: this.handleRepostClick });
}
}
menu.push({ text: formatMessage(messages.delete), action: this.handleDeleteClick });