Merge master

This commit is contained in:
Mendel Konikov
2018-04-10 20:10:21 -04:00
537 changed files with 14237 additions and 4489 deletions
@@ -16,12 +16,16 @@ export default class ModerationActions extends React.Component {
comment,
root,
asset,
data,
menuVisible,
toogleMenu,
hideMenu,
} = this.props;
const slotPassthrough = {
comment,
asset,
};
return (
<ClickOutside onClickOutside={hideMenu}>
<div
@@ -41,12 +45,11 @@ export default class ModerationActions extends React.Component {
)}
</span>
{menuVisible && (
<Menu className="talk-plugin-modetarion-actions-menu">
<Menu className="talk-plugin-moderation-actions-menu">
<Slot
className="talk-plugin-modetarion-actions-slot"
className="talk-plugin-moderation-actions-slot"
fill="moderationActions"
queryData={{ comment, asset }}
data={data}
passthrough={slotPassthrough}
/>
<ApproveCommentAction comment={comment} hideMenu={hideMenu} />
<RejectCommentAction comment={comment} hideMenu={hideMenu} />
@@ -67,7 +70,6 @@ ModerationActions.propTypes = {
comment: PropTypes.object,
root: PropTypes.object,
asset: PropTypes.object,
data: PropTypes.object,
menuVisible: PropTypes.bool,
toogleMenu: PropTypes.func,
hideMenu: PropTypes.func,
@@ -42,7 +42,6 @@ class ModerationActionsContainer extends React.Component {
render() {
return (
<ModerationActions
data={this.props.data}
root={this.props.root}
asset={this.props.asset}
comment={this.props.comment}
@@ -1,3 +1,15 @@
ar:
talk-plugin-moderation-actions:
reject_comment: "رفض"
approve_comment: "موافقة"
approved_comment: "موافق عليه"
moderation_actions: "إجراءات الإشراف"
ban_user: "حجب المستخدم"
ban_user_dialog_sub: "هل أنت متأكد أنك تريد حجب هذا المستخدم؟"
ban_user_dialog_copy: "ملاحظة: سيؤدي حجب هذا المستخدم أيضا إلى وضع هذا التعليق في قائمة الرفض."
ban_user_dialog_cancel: "إلغاء"
ban_user_dialog_yes: "نعم، احجب المستخدم"
ban_user_dialog_headline: "احجب المستخدم؟"
da:
talk-plugin-moderation-actions:
reject_comment: "Reject"