pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

links for blocking/reporting users and topics

Browse Source
This commit is contained in:
or-else
2019-09-22 21:19:04 +03:00
parent 12a0660e5b
commit 2a164ddf49
5 changed files with 137 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/i18n/en.json
+5 -2
View File
@@ -34,11 +34,14 @@
"label_permissions": "Permissions:",
"label_you": "You:",
"label_default_access": "Default access mode:",
"action_delete_messages": "Delete Messages",
"action_leave_chat": "Leave Conversation",
"action_report_group": "Report Group",
"action_block_contact": "Block Contact",
"action_report_contact": "Report Contact",
"label_group_members": "Group members:",
"button_add_members": "Add members",
"button_leave": "Leave",
"group_has_no_members": "No members",
"action_leave_chat": "Leave",
"login_prompt": "Login",
"password_prompt": "Password",
"stay_logged_in": "Stay logged in",
src/i18n/ru.json
+5 -2
View File
@@ -86,7 +86,6 @@
"label_default_access": "Права по умолчанию:",
"label_group_members": "Участники чата:",
"button_add_members": "Добавить",
"button_leave": "Отписаться",
"group_has_no_members": "Нет участников",
"action_leave_chat": "Уйти из чата",
"menu_item_info": "Информация",
@@ -138,5 +137,9 @@
"label_legal": "Прочее",
"link_contact_us": "Связаться с нами",
"link_terms_of_service": "Условия сервиса",
"link_privacy_policy": "Политика конфиденциальности"
"link_privacy_policy": "Политика конфиденциальности",
"action_delete_messages": "Удалить сообщения",
"action_block_contact": "Заблокировать контакт",
"action_report_contact": "Сообщить о нарушении",
"action_report_group": "Сообщить о нарушении"
}
src/i18n/zh-CN.json
+6 -2
View File
@@ -30,7 +30,7 @@
"label_default_access": "默认权限模式：",
"label_group_members": "群组成员：",
"button_add_members": "添加成员",
"button_leave": "离开",
"button_leave": ":!![OBSOLETE]!!:离开",
"group_has_no_members": "无成员",
"action_leave_chat": "离开",
"login_prompt": "登录",
@@ -138,5 +138,9 @@
"label_legal": "法律东西",
"link_contact_us": "联系我们",
"link_terms_of_service": "条款和条件",
"link_privacy_policy": "隐私政策"
"link_privacy_policy": "隐私政策",
"action_delete_messages": "删除所有帖子",
"action_block_contact": "屏蔽联系人",
"action_report_contact": "检举垃圾邮件",
"action_report_group": "检举垃圾邮件"
}
src/messages.json
+15 -6
View File
@@ -35,11 +35,14 @@
"label_permissions": "Permissions:",
"label_you": "You:",
"label_default_access": "Default access mode:",
"action_delete_messages": "Delete Messages",
"action_leave_chat": "Leave Conversation",
"action_report_group": "Report Group",
"action_block_contact": "Block Contact",
"action_report_contact": "Report Contact",
"label_group_members": "Group members:",
"button_add_members": "Add members",
"button_leave": "Leave",
"group_has_no_members": "No members",
"action_leave_chat": "Leave",
"login_prompt": "Login",
"password_prompt": "Password",
"stay_logged_in": "Stay logged in",
@@ -229,7 +232,6 @@
"label_default_access": "Права по умолчанию:",
"label_group_members": "Участники чата:",
"button_add_members": "Добавить",
"button_leave": "Отписаться",
"group_has_no_members": "Нет участников",
"action_leave_chat": "Уйти из чата",
"menu_item_info": "Информация",
@@ -281,7 +283,11 @@
"label_legal": "Прочее",
"link_contact_us": "Связаться с нами",
"link_terms_of_service": "Условия сервиса",
"link_privacy_policy": "Политика конфиденциальности"
"link_privacy_policy": "Политика конфиденциальности",
"action_delete_messages": "Удалить сообщения",
"action_block_contact": "Заблокировать контакт",
"action_report_contact": "Сообщить о нарушении",
"action_report_group": "Сообщить о нарушении"
},
"zh-CN": {
"archived_contacts": "已归档联系人 ({count})",
@@ -315,7 +321,6 @@
"label_default_access": "默认权限模式：",
"label_group_members": "群组成员：",
"button_add_members": "添加成员",
"button_leave": "离开",
"group_has_no_members": "无成员",
"action_leave_chat": "离开",
"login_prompt": "登录",
@@ -423,6 +428,10 @@
"label_legal": "法律东西",
"link_contact_us": "联系我们",
"link_terms_of_service": "条款和条件",
"link_privacy_policy": "隐私政策"
"link_privacy_policy": "隐私政策",
"action_delete_messages": "删除所有帖子",
"action_block_contact": "屏蔽联系人",
"action_report_contact": "检举垃圾邮件",
"action_report_group": "检举垃圾邮件"
}
}
src/views/info-view.jsx
+35 -13
View File
@@ -422,6 +422,7 @@ class InfoView extends React.Component {
<GroupManager
members={this.state.contactList}
requiredMember={this.props.myUserId}
keepInitialMembers={!this.state.admin && !this.state.owner}
myUserId={this.props.myUserId}
contacts={this.props.searchableContacts}
onCancel={this.handleHideAddMembers}
@@ -575,6 +576,7 @@ class InfoView extends React.Component {
</div>
<div className="hr" />
{this.state.owner ?
<>
<FormattedMessage id="title_tag_manager">{
(tags) => <TagManager
title={tags}
@@ -582,11 +584,41 @@ class InfoView extends React.Component {
activated={false}
onSubmit={this.handleTagsUpdated} />
}</FormattedMessage>
<div className="hr" />
</>
:
null
}
{this.state.owner ? <div className="hr" /> : null }
<div className="panel-form-column">
<a href="#" className="flat-button" onClick={this.handleDeleteMessages}>
<i className="material-icons">delete_outline</i> &npbs;<FormattedMessage id="action_delete_messages"
defaultMessage="Delete Messages" description="Flat button [Delete Messages]" />
</a>
<a href="#" className="red flat-button" onClick={this.handleLeave}>
<i className="material-icons">exit_to_app</i> &npbs;<FormattedMessage id="action_leave_chat"
defaultMessage="Leave Conversation" description="Flat button [Leave Conversation]" />
</a>
{this.state.groupTopic ?
<a href="#" className="red flat-button" onClick={this.handleReport}>
<i className="material-icons">report</i> &npbs;<FormattedMessage id="action_report_group"
defaultMessage="Report Group" description="Flat button [Report Group]" />
</a>
:
<>
<a href="#" className="red flat-button" onClick={this.handleBlock}>
<i className="material-icons">block</i> &npbs;<FormattedMessage id="action_block_contact"
defaultMessage="Block Contact" description="Flat button [Block Contact]" />
</a>
<a href="#" className="red flat-button" onClick={this.handleReport}>
<i className="material-icons">report</i> &npbs;<FormattedMessage id="action_report_contact"
defaultMessage="Report Contact" description="Flat button [Report Contact]" />
</a>
</>
}
</div>
{this.state.groupTopic ?
<>
<div className="hr" />
<div className="panel-form-column">
<div className="panel-form-row">
<label className="small">
@@ -601,12 +633,6 @@ class InfoView extends React.Component {
defaultMessage="Add members" description="Flat button [Add members] (to topic)" />
</a>
: null}
{!this.state.owner ?
<a href="#" className="red flat-button" onClick={this.handleLeave}>
<i className="material-icons">exit_to_app</i> <FormattedMessage id="button_leave"
defaultMessage="Leave" description="Flat button [Leave] (topic)" />
</a>
: null}
</div>
<FormattedMessage id="group_has_no_members" defaultMessage="No members"
description="Shown in place of group members">{
@@ -624,13 +650,9 @@ class InfoView extends React.Component {
/>
}</FormattedMessage>
</div>
</>
:
<div className="panel-form-row">
<a href="#" className="red flat-button" onClick={this.handleLeave}>
<i className="material-icons">exit_to_app</i> <FormattedMessage id="action_leave_chat"
defaultMessage="Leave" description="Action [Leave] chat" />
</a>
</div>
null
}
</div>
}