OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2017-10-19 15:43:20 +00:00
parent 7c7cf2714b 0f4ca1992d
commit 43f27e5d9d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/dialogs/CreateGroupDialog.js
View File

@ -66,8 +66,12 @@ export default React.createClass({
{domain: MatrixClientPeg.get().getDomain()},
);
} else {
const groupId = parsedGroupId[0];
const domain = parsedGroupId[1];
if (domain !== MatrixClientPeg.get().getDomain()) {
if (!/^[a-zA-Z0-9]*$/.test(groupId)) {
error = _t("Community IDs may only contain alphanumeric characters");
} else if (domain !== MatrixClientPeg.get().getDomain()) {
error = _t(
"It is currently only possible to create communities on your own home server: "+
"use a community ID ending with %(domain)s",

1
src/i18n/strings/en_EN.json
View File

@ -583,6 +583,7 @@
"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?",
"Community IDs must be of the form +localpart:%(domain)s": "Community IDs must be of the form +localpart:%(domain)s",
"Community IDs may only contain alphanumeric characters": "Community IDs may only contain alphanumeric characters",
"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 Community": "Create Community",