Commit 4efd3aaa authored by webchick's avatar webchick

Issue #2551453 by LoMo, Ayesh, jaxxed, LinL, madhavvyas, Miraya: Follow-up:...

Issue #2551453 by LoMo, Ayesh, jaxxed, LinL, madhavvyas, Miraya: Follow-up: Consistently use "email" instead of "e-mail" in Drupal
parent 38a0e063
......@@ -32,7 +32,7 @@ class EmailItem extends FieldItemBase {
*/
public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
$properties['value'] = DataDefinition::create('email')
->setLabel(t('E-mail'))
->setLabel(t('Email'))
->setRequired(TRUE);
return $properties;
......
......@@ -42,7 +42,7 @@ public function renderRoot(&$elements);
*
* Calls ::render() in such a way that placeholders are replaced.
*
* Useful for e.g. rendering the values of tokens or e-mails, which need a
* Useful for e.g. rendering the values of tokens or emails, which need a
* render array being turned into a string, but don't need any of the
* bubbleable metadata (the attached assets the cache tags).
*
......
......@@ -15,10 +15,10 @@
interface ContactFormInterface extends ConfigEntityInterface {
/**
* Returns list of recipient e-mail addresses.
* Returns list of recipient email addresses.
*
* @return array
* List of recipient e-mail addresses.
* List of recipient email addresses.
*/
public function getRecipients();
......@@ -39,10 +39,10 @@ public function getReply();
public function getWeight();
/**
* Sets list of recipient e-mail addresses.
* Sets list of recipient email addresses.
*
* @param array $recipients
* The desired list of e-mail addresses of this category.
* The desired list of email addresses of this category.
*
* @return $this
*/
......
......@@ -103,10 +103,10 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) {
*
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
* Exception is thrown when user tries to access a contact form for a
* user who does not have an e-mail address configured.
* user who does not have an email address configured.
*/
public function contactPersonalPage(UserInterface $user) {
// Do not continue if the user does not have an e-mail address configured.
// Do not continue if the user does not have an email address configured.
if (!$user->getEmail()) {
throw new NotFoundHttpException();
}
......
......@@ -156,7 +156,7 @@ protected function setUp() {
$this->container = $this->kernel->getContainer();
// Manually configure the test mail collector implementation to prevent
// tests from sending out e-mails and collect them in state instead.
// tests from sending out emails and collect them in state instead.
$this->container->get('config.factory')
->getEditable('system.mail')
->set('interface.default', 'test_mail_collector')
......
......@@ -151,7 +151,7 @@ public function form(array $form, FormStateInterface $form_state) {
// The user may only change their own password without their current
// password if they logged in via a one-time login link.
if (!$form_state->get('user_pass_reset')) {
$form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. <a href=":request_new_url" title="Send password reset instructions via e-mail.">Reset your password</a>.', array(
$form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. <a href=":request_new_url" title="Send password reset instructions via email.">Reset your password</a>.', array(
'%mail' => $form['account']['mail']['#title'],
'%pass' => $this->t('Password'),
':request_new_url' => $this->url('user.pass'),
......
......@@ -99,7 +99,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
else {
$form['mail'] = array(
'#prefix' => '<p>',
'#markup' => $this->t('Password reset instructions will be sent to your registered e-mail address.'),
'#markup' => $this->t('Password reset instructions will be sent to your registered email address.'),
'#suffix' => '</p>',
);
$form['name']['#default_value'] = $this->getRequest()->query->get('name');
......
......@@ -112,7 +112,7 @@ public function build() {
}
$items['request_password'] = \Drupal::l($this->t('Reset your password'), new Url('user.pass', array(), array(
'attributes' => array(
'title' => $this->t('Send password reset instructions via e-mail.'),
'title' => $this->t('Send password reset instructions via email.'),
'class' => array('request-password-link'),
),
)));
......
......@@ -49,7 +49,7 @@ protected function setUp() {
* @param string $label
* The username.
* @param string $mail
* The user's e-mail address.
* The user's email address.
* @param int $access
* The last access time.
* @param int $login
......@@ -59,7 +59,7 @@ protected function setUp() {
* @param string $langcode
* The user account's language code.
* @param string $init
* The user's initial e-mail address.
* The user's initial email address.
* @param string[] $roles
* Role IDs the user account is expected to have.
* @param bool $has_picture
......
......@@ -134,7 +134,7 @@ function testValidation() {
$this->assertEqual($violations[0]->getMessage(), t('The email address %mail is already taken.', array('%mail' => 'existing@example.com')));
$user->set('mail', NULL);
$violations = $user->validate();
$this->assertEqual(count($violations), 1, 'E-mail addresses may not be removed');
$this->assertEqual(count($violations), 1, 'Email addresses may not be removed');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail');
$this->assertEqual($violations[0]->getMessage(), t('@name field is required.', array('@name' => $user->getFieldDefinition('mail')->getLabel())));
$user->set('mail', 'someone@example.com');
......
......@@ -3,11 +3,11 @@ administer permissions:
restrict access: true
administer account settings:
title: 'Administer account settings'
description: 'Configure site-wide settings and behavior for user accounts and registration. This includes account cancellation methods, the content of user e-mails and fields attached to users.'
description: 'Configure site-wide settings and behavior for user accounts and registration. This includes account cancellation methods, the content of user emails and fields attached to users.'
restrict access: true
administer users:
title: 'Administer users'
description: 'Manage all user accounts. This includes editing all user information, changes of e-mail addresses and passwords, issuing e-mails to users and blocking and deleting user accounts.'
description: 'Manage all user accounts. This includes editing all user information, changes of email addresses and passwords, issuing emails to users and blocking and deleting user accounts.'
restrict access: true
access user profiles:
title: 'View user information'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment