Merge pull request #6506 from DougReeder/pronouns

Pronouns may also be separated by comma or space

Author: Exairnous

src/react-components/room/AvatarSettingsContent.js

@@ -27,6 +27,7 @@ export function AvatarSettingsContent({
         label={<FormattedMessage id="avatar-settings-content.display-name-label" defaultMessage="Display Name" />}
         value={displayName}
         pattern={displayNamePattern}
+        placeholder="displayed over your avatar"
         spellCheck="false"
         required
         onChange={onChangeDisplayName}
@@ -42,6 +43,7 @@ export function AvatarSettingsContent({
         label={<FormattedMessage id="avatar-settings-content.pronouns-label" defaultMessage="Pronouns (optional)" />}
         value={pronouns}
         pattern={pronounsPattern}
+        placeholder="slash, comma or space separated"
         spellCheck="false"
         onChange={onChangePronouns}
         ref={pronounsInputRef}

src/storage/store.js

@@ -65,7 +65,7 @@ export const SCHEMA = {
       properties: {
         displayName: { type: "string", pattern: "^[A-Za-z0-9_~\\s\\-]{3,32}$" },
         avatarId: { type: "string" },
-        pronouns: { type: "string", pattern: "^([a-zA-Z]{1,32}\\/){0,4}[a-zA-Z]{1,32}$" },
+        pronouns: { type: "string", pattern: "^([a-zA-Z]{1,32}[\\/, ]\\s*){0,4}[a-zA-Z]{1,32}$" },
         // personalAvatarId is obsolete, but we need it here for backwards compatibility.
         personalAvatarId: { type: "string" }
       }