summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2015-09-25 13:27:23 (GMT)
committerwebchick2015-09-25 13:27:23 (GMT)
commit4efd3aaa2598f347b4c27fb21a0b9a3f45250eef (patch)
tree8c8bfb0bb86ca7421158c8d451c76b00eb997761
parent38a0e063c64fe0b525c5d07de813b8a6fe526693 (diff)
Issue #2551453 by LoMo, Ayesh, jaxxed, LinL, madhavvyas, Miraya: Follow-up: Consistently use "email" instead of "e-mail" in Drupal
-rw-r--r--core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php2
-rw-r--r--core/lib/Drupal/Core/Render/RendererInterface.php2
-rw-r--r--core/modules/contact/src/ContactFormInterface.php8
-rw-r--r--core/modules/contact/src/Controller/ContactController.php4
-rw-r--r--core/modules/simpletest/src/InstallerTestBase.php2
-rw-r--r--core/modules/user/src/AccountForm.php2
-rw-r--r--core/modules/user/src/Form/UserPasswordForm.php2
-rw-r--r--core/modules/user/src/Plugin/Block/UserLoginBlock.php2
-rw-r--r--core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php4
-rw-r--r--core/modules/user/src/Tests/UserValidationTest.php2
-rw-r--r--core/modules/user/user.permissions.yml4
11 files changed, 17 insertions, 17 deletions
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index 7ed68fb..ae43ecf 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -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;
diff --git a/core/lib/Drupal/Core/Render/RendererInterface.php b/core/lib/Drupal/Core/Render/RendererInterface.php
index 9bb4cdb..649cf98 100644
--- a/core/lib/Drupal/Core/Render/RendererInterface.php
+++ b/core/lib/Drupal/Core/Render/RendererInterface.php
@@ -42,7 +42,7 @@ interface RendererInterface {
*
* 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).
*
diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php
index 0397bc4..8f588ee 100644
--- a/core/modules/contact/src/ContactFormInterface.php
+++ b/core/modules/contact/src/ContactFormInterface.php
@@ -15,10 +15,10 @@ use Drupal\Core\Config\Entity\ConfigEntityInterface;
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 @@ interface ContactFormInterface extends ConfigEntityInterface {
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
*/
diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php
index fb6830d..1a9b724 100644
--- a/core/modules/contact/src/Controller/ContactController.php
+++ b/core/modules/contact/src/Controller/ContactController.php
@@ -103,10 +103,10 @@ class ContactController extends ControllerBase {
*
* @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();
}
diff --git a/core/modules/simpletest/src/InstallerTestBase.php b/core/modules/simpletest/src/InstallerTestBase.php
index e6f7d7b..0b8ff77 100644
--- a/core/modules/simpletest/src/InstallerTestBase.php
+++ b/core/modules/simpletest/src/InstallerTestBase.php
@@ -156,7 +156,7 @@ abstract class InstallerTestBase extends WebTestBase {
$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')
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index f1c505d..36dbd77 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -151,7 +151,7 @@ abstract class AccountForm extends ContentEntityForm {
// 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'),
diff --git a/core/modules/user/src/Form/UserPasswordForm.php b/core/modules/user/src/Form/UserPasswordForm.php
index 8a1a839..e1c4ada 100644
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
@@ -99,7 +99,7 @@ class UserPasswordForm extends FormBase {
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');
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index 437c881..3831dd7 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -112,7 +112,7 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
}
$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'),
),
)));
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
index c6c2cbb..8381b1d 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
@@ -49,7 +49,7 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
* @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 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
* @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
diff --git a/core/modules/user/src/Tests/UserValidationTest.php b/core/modules/user/src/Tests/UserValidationTest.php
index b419103..f39e11e 100644
--- a/core/modules/user/src/Tests/UserValidationTest.php
+++ b/core/modules/user/src/Tests/UserValidationTest.php
@@ -134,7 +134,7 @@ class UserValidationTest extends KernelTestBase {
$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');
diff --git a/core/modules/user/user.permissions.yml b/core/modules/user/user.permissions.yml
index 6eb0697..810583c 100644
--- a/core/modules/user/user.permissions.yml
+++ b/core/modules/user/user.permissions.yml
@@ -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'