summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2015-10-05 17:30:45 (GMT)
committerwebchick2015-10-05 17:30:45 (GMT)
commitf49a8a48d2ad73196e568333f94b8624e1592da7 (patch)
tree6a1ec67ed707b4cf89871445b50a4ef5561fb2e5
parentcc51b6ef5a5c05b302ec090be2bf73d347dd0284 (diff)
Issue #827468 by paulmartin84, latikas, aburrows, alimac, fatfish, rocket_nova, Truptti, pektinasen, DuaelFr, YesCT, ifrik, John Cook, danylevskyi, dcam, anil.gangwal, gajendra sharma, danharper, mgriego, realityloop, bleen18, alvar0hurtad0, dddave, droplet, susanb, nlisgo, webchick, meeli: Fix the allowed punctuation wording in user_edit_form
-rw-r--r--core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php2
-rw-r--r--core/modules/user/src/AccountForm.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php b/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
index 9e18f71..3b43dee 100644
--- a/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
+++ b/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
@@ -174,7 +174,7 @@ class SiteConfigureForm extends ConfigFormBase {
'#type' => 'textfield',
'#title' => $this->t('Username'),
'#maxlength' => USERNAME_MAX_LENGTH,
- '#description' => $this->t('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.'),
+ '#description' => $this->t("Several special characters are allowed, including space, period (.), hyphen (-), apostrophe ('), underscore (_), and the @ sign."),
'#required' => TRUE,
'#attributes' => array('class' => array('username')),
);
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index 4b10f19..289a1a9 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -104,7 +104,7 @@ abstract class AccountForm extends ContentEntityForm {
'#type' => 'textfield',
'#title' => $this->t('Username'),
'#maxlength' => USERNAME_MAX_LENGTH,
- '#description' => $this->t('Spaces are allowed; punctuation is not allowed except for periods, hyphens, apostrophes, and underscores.'),
+ '#description' => $this->t("Several special characters are allowed, including space, period (.), hyphen (-), apostrophe ('), underscore (_), and the @ sign."),
'#required' => TRUE,
'#attributes' => array(
'class' => array('username'),