From 2be0ebdd1d948f4dc94b1032c732e777afcd03f0 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 19 Oct 2017 15:01:16 +0100 Subject: [PATCH] More Groups->Communities --- src/GroupAddressPicker.js | 16 +++---- src/components/structures/GroupView.js | 6 +-- src/components/structures/MyGroups.js | 2 +- .../views/dialogs/CreateGroupDialog.js | 12 ++--- .../views/groups/GroupMemberInfo.js | 6 +-- .../views/groups/GroupMemberList.js | 2 +- src/components/views/groups/GroupRoomList.js | 2 +- src/components/views/groups/GroupRoomTile.js | 4 +- src/i18n/strings/en_EN.json | 46 +++++++++---------- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js index b710524ce3..2e3c276f65 100644 --- a/src/GroupAddressPicker.js +++ b/src/GroupAddressPicker.js @@ -24,10 +24,10 @@ import GroupStoreCache from './stores/GroupStoreCache'; export function showGroupInviteDialog(groupId) { const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); Modal.createTrackedDialog('Group Invite', '', AddressPickerDialog, { - title: _t("Invite new group members"), - description: _t("Who would you like to add to this group?"), + title: _t("Invite new community members"), + description: _t("Who would you like to add to this community?"), placeholder: _t("Name or matrix ID"), - button: _t("Invite to Group"), + button: _t("Invite to Community"), validAddressTypes: ['mx-user-id'], onFinished: (success, addrs) => { if (!success) return; @@ -41,10 +41,10 @@ export function showGroupAddRoomDialog(groupId) { return new Promise((resolve, reject) => { const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, { - title: _t("Add rooms to the group"), - description: _t("Which rooms would you like to add to this group?"), + title: _t("Add rooms to the community"), + description: _t("Which rooms would you like to add to this community?"), placeholder: _t("Room name or alias"), - button: _t("Add to group"), + button: _t("Add to community"), pickerType: 'room', validAddressTypes: ['mx-room-id'], onFinished: (success, addrs) => { @@ -80,14 +80,14 @@ function _onGroupInviteFinished(groupId, addrs) { const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createTrackedDialog('Group invitations sent', '', QuestionDialog, { title: _t("Invites sent"), - description: _t("Your group invitations have been sent."), + description: _t("Your community invitations have been sent."), hasCancelButton: false, }); } }).catch((err) => { const ErrorDialog = sdk.getComponent("dialogs.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}), }); }); diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 53ad937cbb..361551b94e 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -743,7 +743,7 @@ export default React.createClass({ return
- { _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}) }
; } else if (group.myMembership === 'join' && this.state.editing) { const leaveButtonTooltip = this.state.isUserPrivileged ? - _t("You are a member of this group") : - _t("You are an administrator of this group"); + _t("You are a member of this community") : + _t("You are an administrator of this community"); const leaveButtonClasses = classnames({ "mx_RoomHeader_textButton": true, "mx_GroupView_textButton": true, diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js index 9166ef0e64..f493b5b2d8 100644 --- a/src/components/structures/MyGroups.js +++ b/src/components/structures/MyGroups.js @@ -102,7 +102,7 @@ export default withMatrixClient(React.createClass({ } return
- +
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js index 07ebb13aad..ccb051d3e1 100644 --- a/src/components/views/dialogs/CreateGroupDialog.js +++ b/src/components/views/dialogs/CreateGroupDialog.js @@ -62,15 +62,15 @@ export default React.createClass({ let error = null; if (parsedGroupId === null) { 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()}, ); } else { const domain = parsedGroupId[1]; if (domain !== MatrixClientPeg.get().getDomain()) { error = _t( - "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", {domain: MatrixClientPeg.get().getDomain()}, ); } @@ -150,13 +150,13 @@ export default React.createClass({ return (
- +
- +
{ if (!proceed) return; @@ -86,7 +86,7 @@ module.exports = withMatrixClient(React.createClass({ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, { title: _t('Error'), - description: _t('Failed to remove user from group'), + description: _t('Failed to remove user from community'), }); }).finally(() => { this.setState({removingUser: false}); @@ -128,7 +128,7 @@ module.exports = withMatrixClient(React.createClass({ kickButton = ( - { _t('Remove from group') } + { _t('Remove from community') } ); diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js index 61032724e4..899543238c 100644 --- a/src/components/views/groups/GroupMemberList.js +++ b/src/components/views/groups/GroupMemberList.js @@ -153,7 +153,7 @@ export default withMatrixClient(React.createClass({ + placeholder={_t('Filter community members')} /> ); diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js index 4ff68a7f4d..5dd4de110e 100644 --- a/src/components/views/groups/GroupRoomList.js +++ b/src/components/views/groups/GroupRoomList.js @@ -126,7 +126,7 @@ export default React.createClass({
+ placeholder={_t('Filter community rooms')} />
); diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js index bb0fdb03f4..23e53996e3 100644 --- a/src/components/views/groups/GroupRoomTile.js +++ b/src/components/views/groups/GroupRoomTile.js @@ -58,7 +58,7 @@ const GroupRoomTile = React.createClass({ console.error(`Error whilst removing ${roomId} from ${groupId}`, err); const ErrorDialog = sdk.getComponent("dialogs.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}), }); }); @@ -87,7 +87,7 @@ const GroupRoomTile = React.createClass({ const QuestionDialog = sdk.getComponent("dialogs.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}), - 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"), onFinished: (success) => { if (success) { diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4c8cc05d56..b3bbd4eb9a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -43,18 +43,18 @@ "%(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 %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s", - "Invite new group members": "Invite new group members", - "Who would you like to add to this group?": "Who would you like to add to this group?", + "Invite new community members": "Invite new community members", + "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", - "Invite to Group": "Invite to Group", - "Add rooms to the group": "Add rooms to the group", - "Which rooms would you like to add to this group?": "Which rooms would you like to add to this group?", + "Invite to Community": "Invite to Community", + "Add rooms to the community": "Add rooms to the community", + "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", - "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:", "Invites sent": "Invites sent", - "Your group invitations have been sent.": "Your group invitations have been sent.", - "Failed to invite users group": "Failed to invite users group", + "Your community invitations have been sent.": "Your community invitations have been sent.", + "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 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", @@ -483,14 +483,14 @@ "Home server URL": "Home server URL", "Identity server URL": "Identity server URL", "What does this mean?": "What does this mean?", - "Remove from group": "Remove from group", - "Failed to remove user from group": "Failed to remove user from group", - "Filter group members": "Filter group members", - "Filter group rooms": "Filter group rooms", - "Failed to remove room from group": "Failed to remove room from group", + "Remove from community": "Remove from community", + "Failed to remove user from community": "Failed to remove user from community", + "Filter community members": "Filter community members", + "Filter community rooms": "Filter community rooms", + "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", "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", "Unknown Address": "Unknown Address", "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted", @@ -580,13 +580,13 @@ "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.", "%(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", - "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", + "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 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", - "Create Group": "Create Group", - "Group Name": "Group Name", + "Create Community": "Create Community", + "Community Name": "Community Name", "Example": "Example", - "Group ID": "Group ID", + "Community ID": "Community ID", "+example:%(domain)s": "+example:%(domain)s", "Create": "Create", "Create Room": "Create Room", @@ -678,9 +678,9 @@ "Add rooms to this community": "Add rooms to this community", "Featured Rooms:": "Featured Rooms:", "Featured Users:": "Featured Users:", - "%(inviter)s has invited you to join this group": "%(inviter)s has invited you to join this group", - "You are a member of this group": "You are a member of this group", - "You are an administrator of this group": "You are an administrator of 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 community": "You are a member of this community", + "You are an administrator of this community": "You are an administrator of this community", "Community Member Settings": "Community Member Settings", "Publish this community on your profile": "Publish this community on your profile", "Long Description (HTML)": "Long Description (HTML)", @@ -700,7 +700,7 @@ "Logout": "Logout", "You are a member of these communities:": "You are a member of these 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 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",