PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1503 from matrix-org/luke/groups-are-communities-2

Browse source 
More Groups->Communities
This commit is contained in:
Luke Barnard 2017-10-19 15:07:40 +01:00 committed by GitHub
commit e324511143
9 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/GroupAddressPicker.js
View file

@ -24,10 +24,10 @@ import GroupStoreCache from './stores/GroupStoreCache';
export function showGroupInviteDialog(groupId) { export function showGroupInviteDialog(groupId) {
const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
Modal.createTrackedDialog('Group Invite', '', AddressPickerDialog, { Modal.createTrackedDialog('Group Invite', '', AddressPickerDialog, {
title: _t("Invite new group members"), title: _t("Invite new community members"),
description: _t("Who would you like to add to this group?"), description: _t("Who would you like to add to this community?"),
placeholder: _t("Name or matrix ID"), placeholder: _t("Name or matrix ID"),
button: _t("Invite to Group"), button: _t("Invite to Community"),
validAddressTypes: ['mx-user-id'], validAddressTypes: ['mx-user-id'],
onFinished: (success, addrs) => { onFinished: (success, addrs) => {
if (!success) return; if (!success) return;
@ -41,10 +41,10 @@ export function showGroupAddRoomDialog(groupId) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, { Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, {
title: _t("Add rooms to the group"), title: _t("Add rooms to the community"),
description: _t("Which rooms would you like to add to this group?"), description: _t("Which rooms would you like to add to this community?"),
placeholder: _t("Room name or alias"), placeholder: _t("Room name or alias"),
button: _t("Add to group"), button: _t("Add to community"),
pickerType: 'room', pickerType: 'room',
validAddressTypes: ['mx-room-id'], validAddressTypes: ['mx-room-id'],
onFinished: (success, addrs) => { onFinished: (success, addrs) => {
@ -80,14 +80,14 @@ function _onGroupInviteFinished(groupId, addrs) {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createTrackedDialog('Group invitations sent', '', QuestionDialog, { Modal.createTrackedDialog('Group invitations sent', '', QuestionDialog, {
title: _t("Invites sent"), title: _t("Invites sent"),
description: _t("Your group invitations have been sent."), description: _t("Your community invitations have been sent."),
hasCancelButton: false, hasCancelButton: false,
}); });
} }
}).catch((err) => { }).catch((err) => {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to invite users to group', '', ErrorDialog, { Modal.createTrackedDialog('Failed to invite users to group', '', ErrorDialog, {
title: _t("Failed to invite users group"), title: _t("Failed to invite users to community"),
description: _t("Failed to invite users to %(groupId)s", {groupId: groupId}), description: _t("Failed to invite users to %(groupId)s", {groupId: groupId}),
}); });
}); });

6
src/components/structures/GroupView.js
View file

@ -743,7 +743,7 @@ export default React.createClass({
return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited"> return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited">
<div className="mx_GroupView_membershipSubSection"> <div className="mx_GroupView_membershipSubSection">
<div className="mx_GroupView_membershipSection_description"> <div className="mx_GroupView_membershipSection_description">
{ _t("%(inviter)s has invited you to join this group", {inviter: group.inviter.userId}) } { _t("%(inviter)s has invited you to join this community", {inviter: group.inviter.userId}) }
</div> </div>
<div className="mx_GroupView_membership_buttonContainer"> <div className="mx_GroupView_membership_buttonContainer">
<AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton" <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
@ -761,8 +761,8 @@ export default React.createClass({
</div>; </div>;
} else if (group.myMembership === 'join' && this.state.editing) { } else if (group.myMembership === 'join' && this.state.editing) {
const leaveButtonTooltip = this.state.isUserPrivileged ? const leaveButtonTooltip = this.state.isUserPrivileged ?
_t("You are a member of this group") : _t("You are a member of this community") :
_t("You are an administrator of this group"); _t("You are an administrator of this community");
const leaveButtonClasses = classnames({ const leaveButtonClasses = classnames({
"mx_RoomHeader_textButton": true, "mx_RoomHeader_textButton": true,
"mx_GroupView_textButton": true, "mx_GroupView_textButton": true,

2
src/components/structures/MyGroups.js
View file

@ -102,7 +102,7 @@ export default withMatrixClient(React.createClass({
} }
return <div className="mx_MyGroups"> return <div className="mx_MyGroups">
<SimpleRoomHeader title={_t("Groups")} icon="img/icons-groups.svg" /> <SimpleRoomHeader title={_t("Communities")} icon="img/icons-groups.svg" />
<div className='mx_MyGroups_joinCreateBox'> <div className='mx_MyGroups_joinCreateBox'>
<div className="mx_MyGroups_createBox"> <div className="mx_MyGroups_createBox">
<div className="mx_MyGroups_joinCreateHeader"> <div className="mx_MyGroups_joinCreateHeader">

12
src/components/views/dialogs/CreateGroupDialog.js
View file

@ -62,15 +62,15 @@ export default React.createClass({
let error = null; let error = null;
if (parsedGroupId === null) { if (parsedGroupId === null) {
error = _t( error = _t(
"Group IDs must be of the form +localpart:%(domain)s", "Community IDs must be of the form +localpart:%(domain)s",
{domain: MatrixClientPeg.get().getDomain()}, {domain: MatrixClientPeg.get().getDomain()},
); );
} else { } else {
const domain = parsedGroupId[1]; const domain = parsedGroupId[1];
if (domain !== MatrixClientPeg.get().getDomain()) { if (domain !== MatrixClientPeg.get().getDomain()) {
error = _t( error = _t(
"It is currently only possible to create groups on your own home server: "+ "It is currently only possible to create communities on your own home server: "+
"use a group ID ending with %(domain)s", "use a community ID ending with %(domain)s",
{domain: MatrixClientPeg.get().getDomain()}, {domain: MatrixClientPeg.get().getDomain()},
); );
} }
@ -150,13 +150,13 @@ export default React.createClass({
return ( return (
<BaseDialog className="mx_CreateGroupDialog" onFinished={this.props.onFinished} <BaseDialog className="mx_CreateGroupDialog" onFinished={this.props.onFinished}
onEnterPressed={this._onFormSubmit} onEnterPressed={this._onFormSubmit}
title={_t('Create Group')} title={_t('Create Community')}
> >
<form onSubmit={this._onFormSubmit}> <form onSubmit={this._onFormSubmit}>
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
<div className="mx_CreateGroupDialog_inputRow"> <div className="mx_CreateGroupDialog_inputRow">
<div className="mx_CreateGroupDialog_label"> <div className="mx_CreateGroupDialog_label">
<label htmlFor="groupname">{ _t('Group Name') }</label> <label htmlFor="groupname">{ _t('Community Name') }</label>
</div> </div>
<div> <div>
<input id="groupname" className="mx_CreateGroupDialog_input" <input id="groupname" className="mx_CreateGroupDialog_input"
@ -169,7 +169,7 @@ export default React.createClass({
</div> </div>
<div className="mx_CreateGroupDialog_inputRow"> <div className="mx_CreateGroupDialog_inputRow">
<div className="mx_CreateGroupDialog_label"> <div className="mx_CreateGroupDialog_label">
<label htmlFor="groupid">{ _t('Group ID') }</label> <label htmlFor="groupid">{ _t('Community ID') }</label>
</div> </div>
<div> <div>
<input id="groupid" className="mx_CreateGroupDialog_input" <input id="groupid" className="mx_CreateGroupDialog_input"

6
src/components/views/groups/GroupMemberInfo.js
View file

@ -68,7 +68,7 @@ module.exports = withMatrixClient(React.createClass({
const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
Modal.createDialog(ConfirmUserActionDialog, { Modal.createDialog(ConfirmUserActionDialog, {
groupMember: this.props.groupMember, groupMember: this.props.groupMember,
action: _t('Remove from group'), action: _t('Remove from community'),
danger: true, danger: true,
onFinished: (proceed) => { onFinished: (proceed) => {
if (!proceed) return; if (!proceed) return;
@ -86,7 +86,7 @@ module.exports = withMatrixClient(React.createClass({
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, { Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
title: _t('Error'), title: _t('Error'),
description: _t('Failed to remove user from group'), description: _t('Failed to remove user from community'),
}); });
}).finally(() => { }).finally(() => {
this.setState({removingUser: false}); this.setState({removingUser: false});
@ -128,7 +128,7 @@ module.exports = withMatrixClient(React.createClass({
kickButton = ( kickButton = (
<AccessibleButton className="mx_MemberInfo_field" <AccessibleButton className="mx_MemberInfo_field"
onClick={this._onKick}> onClick={this._onKick}>
{ _t('Remove from group') } { _t('Remove from community') }
</AccessibleButton> </AccessibleButton>
); );

2
src/components/views/groups/GroupMemberList.js
View file

@ -153,7 +153,7 @@ export default withMatrixClient(React.createClass({
<form autoComplete="off"> <form autoComplete="off">
<input className="mx_GroupMemberList_query" id="mx_GroupMemberList_query" type="text" <input className="mx_GroupMemberList_query" id="mx_GroupMemberList_query" type="text"
onChange={this.onSearchQueryChanged} value={this.state.searchQuery} onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
placeholder={_t('Filter group members')} /> placeholder={_t('Filter community members')} />
</form> </form>
); );

2
src/components/views/groups/GroupRoomList.js
View file

@ -126,7 +126,7 @@ export default React.createClass({
<form autoComplete="off"> <form autoComplete="off">
<input className="mx_GroupRoomList_query" id="mx_GroupRoomList_query" type="text" <input className="mx_GroupRoomList_query" id="mx_GroupRoomList_query" type="text"
onChange={this.onSearchQueryChanged} value={this.state.searchQuery} onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
placeholder={_t('Filter group rooms')} /> placeholder={_t('Filter community rooms')} />
</form> </form>
); );

4
src/components/views/groups/GroupRoomTile.js
View file

@ -58,7 +58,7 @@ const GroupRoomTile = React.createClass({
console.error(`Error whilst removing ${roomId} from ${groupId}`, err); console.error(`Error whilst removing ${roomId} from ${groupId}`, err);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, { Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
title: _t("Failed to remove room from group"), title: _t("Failed to remove room from community"),
description: _t("Failed to remove '%(roomName)s' from %(groupId)s", {groupId, roomName}), description: _t("Failed to remove '%(roomName)s' from %(groupId)s", {groupId, roomName}),
}); });
}); });
@ -87,7 +87,7 @@ const GroupRoomTile = React.createClass({
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createTrackedDialog('Confirm removal of group from room', '', QuestionDialog, { Modal.createTrackedDialog('Confirm removal of group from room', '', QuestionDialog, {
title: _t("Are you sure you want to remove '%(roomName)s' from %(groupId)s?", {roomName, groupId}), title: _t("Are you sure you want to remove '%(roomName)s' from %(groupId)s?", {roomName, groupId}),
description: _t("Removing a room from the group will also remove it from the group page."), description: _t("Removing a room from the community will also remove it from the community page."),
button: _t("Remove"), button: _t("Remove"),
onFinished: (success) => { onFinished: (success) => {
if (success) { if (success) {

46
src/i18n/strings/en_EN.json
View file

@ -43,18 +43,18 @@
"%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s", "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
"%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s", "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
"Invite new group members": "Invite new group members", "Invite new community members": "Invite new community members",
"Who would you like to add to this group?": "Who would you like to add to this group?", "Who would you like to add to this community?": "Who would you like to add to this community?",
"Name or matrix ID": "Name or matrix ID", "Name or matrix ID": "Name or matrix ID",
"Invite to Group": "Invite to Group", "Invite to Community": "Invite to Community",
"Add rooms to the group": "Add rooms to the group", "Add rooms to the community": "Add rooms to the community",
"Which rooms would you like to add to this group?": "Which rooms would you like to add to this group?", "Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
"Room name or alias": "Room name or alias", "Room name or alias": "Room name or alias",
"Add to group": "Add to group", "Add to community": "Add to community",
"Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:", "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
"Invites sent": "Invites sent", "Invites sent": "Invites sent",
"Your group invitations have been sent.": "Your group invitations have been sent.", "Your community invitations have been sent.": "Your community invitations have been sent.",
"Failed to invite users group": "Failed to invite users group", "Failed to invite users community": "Failed to invite users community",
"Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
"Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
@ -483,14 +483,14 @@
"Home server URL": "Home server URL", "Home server URL": "Home server URL",
"Identity server URL": "Identity server URL", "Identity server URL": "Identity server URL",
"What does this mean?": "What does this mean?", "What does this mean?": "What does this mean?",
"Remove from group": "Remove from group", "Remove from community": "Remove from community",
"Failed to remove user from group": "Failed to remove user from group", "Failed to remove user from community": "Failed to remove user from community",
"Filter group members": "Filter group members", "Filter community members": "Filter community members",
"Filter group rooms": "Filter group rooms", "Filter community rooms": "Filter community rooms",
"Failed to remove room from group": "Failed to remove room from group", "Failed to remove room from community": "Failed to remove room from community",
"Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s", "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
"Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?", "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
"Removing a room from the group will also remove it from the group page.": "Removing a room from the group will also remove it from the group page.", "Removing a room from the community will also remove it from the community page.": "Removing a room from the community will also remove it from the community page.",
"Remove": "Remove", "Remove": "Remove",
"Unknown Address": "Unknown Address", "Unknown Address": "Unknown Address",
"NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted", "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
@ -580,13 +580,13 @@
"Confirm Removal": "Confirm Removal", "Confirm Removal": "Confirm Removal",
"Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.", "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
"%(actionVerb)s this person?": "%(actionVerb)s this person?", "%(actionVerb)s this person?": "%(actionVerb)s this person?",
"Group IDs must be of the form +localpart:%(domain)s": "Group IDs must be of the form +localpart:%(domain)s", "Community IDs must be of the form +localpart:%(domain)s": "Community IDs must be of the form +localpart:%(domain)s",
"It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s", "It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s": "It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s",
"Room creation failed": "Room creation failed", "Room creation failed": "Room creation failed",
"Create Group": "Create Group", "Create Community": "Create Community",
"Group Name": "Group Name", "Community Name": "Community Name",
"Example": "Example", "Example": "Example",
"Group ID": "Group ID", "Community ID": "Community ID",
"+example:%(domain)s": "+example:%(domain)s", "+example:%(domain)s": "+example:%(domain)s",
"Create": "Create", "Create": "Create",
"Create Room": "Create Room", "Create Room": "Create Room",
@ -678,9 +678,9 @@
"Add rooms to this community": "Add rooms to this community", "Add rooms to this community": "Add rooms to this community",
"Featured Rooms:": "Featured Rooms:", "Featured Rooms:": "Featured Rooms:",
"Featured Users:": "Featured Users:", "Featured Users:": "Featured Users:",
"%(inviter)s has invited you to join this group": "%(inviter)s has invited you to join this group", "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
"You are a member of this group": "You are a member of this group", "You are a member of this community": "You are a member of this community",
"You are an administrator of this group": "You are an administrator of this group", "You are an administrator of this community": "You are an administrator of this community",
"Community Member Settings": "Community Member Settings", "Community Member Settings": "Community Member Settings",
"Publish this community on your profile": "Publish this community on your profile", "Publish this community on your profile": "Publish this community on your profile",
"Long Description (HTML)": "Long Description (HTML)", "Long Description (HTML)": "Long Description (HTML)",
@ -700,7 +700,7 @@
"Logout": "Logout", "Logout": "Logout",
"You are a member of these communities:": "You are a member of these communities:", "You are a member of these communities:": "You are a member of these communities:",
"Error whilst fetching joined communities": "Error whilst fetching joined communities", "Error whilst fetching joined communities": "Error whilst fetching joined communities",
"Groups": "Groups", "Communities": "Communities",
"Create a new community": "Create a new community", "Create a new community": "Create a new community",
"Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.", "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.",
"Join an existing community": "Join an existing community", "Join an existing community": "Join an existing community",