Skip to content

Commit b1ba26e

Browse files
committed
Allow usernames to contain @-signs as long as it is not at the begininng
This allows to use email addresses as usernames and fixes issue #772
1 parent ca8ad76 commit b1ba26e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Entity/UserSystem/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
256256
protected ?string $password = null;
257257

258258
#[Assert\NotBlank]
259-
#[Assert\Regex('/^[\w\.\+\-\$]+$/', message: 'user.invalid_username')]
259+
#[Assert\Regex('/^[\w\.\+\-\$]+[\w\.\+\-\$\@]*$/', message: 'user.invalid_username')]
260260
#[Groups(['user:read'])]
261261
protected string $name = '';
262262

translations/validators.de.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
</notes>
165165
<segment state="translated">
166166
<source>user.invalid_username</source>
167-
<target>Der Benutzername darf nur Buchstaben, Zahlen, Unterstriche, Punkte, Plus- oder Minuszeichen enthalten.</target>
167+
<target>Der Benutzername darf nur Buchstaben, Zahlen, Unterstriche, Punkte, Plus- oder Minuszeichen enthalten und darf nicht mit einem @ beginnen.</target>
168168
</segment>
169169
</unit>
170170
<unit id="_v.DMg." name="validator.noneofitschild.self">

translations/validators.en.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
</notes>
165165
<segment state="translated">
166166
<source>user.invalid_username</source>
167-
<target>The username must contain only letters, numbers, underscores, dots, pluses or minuses!</target>
167+
<target>The username must contain only letters, numbers, underscores, dots, pluses or minuses and must not begin with an @!</target>
168168
</segment>
169169
</unit>
170170
<unit id="_v.DMg." name="validator.noneofitschild.self">

0 commit comments

Comments
 (0)