diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
index f0bb645..8e41bd6 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
@@ -17,7 +17,8 @@
* id = "string",
* label = @Translation("Plain text"),
* field_types = {
- * "string"
+ * "string",
+ * "email"
* },
* edit = {
* "editor" = "plain_text"
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
index 3fbbb1d..5fb717a 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
@@ -65,7 +65,7 @@ public function getConstraints() {
'value' => array(
'Length' => array(
'max' => $max_length,
- 'maxMessage' => t('%name: the string may not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length)),
+ 'maxMessage' => t('%name: may not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length)),
),
),
));
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php
index 524e89d..8d13286 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php
@@ -17,7 +17,8 @@
* id = "string",
* label = @Translation("String field"),
* field_types = {
- * "string"
+ * "string",
+ * "email"
* },
* settings = {
* "size" = "60",
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentValidationTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentValidationTest.php
index a3567da..3aa5f24 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentValidationTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentValidationTest.php
@@ -136,7 +136,7 @@ protected function assertLengthViolation(CommentInterface $comment, $field_name,
$this->assertEqual(count($violations), 1, "Violation found when $field_name is too long.");
$this->assertEqual($violations[0]->getPropertyPath(), "$field_name.0.value");
$field_label = $comment->get($field_name)->getFieldDefinition()->getLabel();
- $this->assertEqual($violations[0]->getMessage(), t('%name: the string may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
+ $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
}
}
diff --git a/core/modules/email/email.module b/core/modules/email/email.module
index 363c33d..54d426a 100644
--- a/core/modules/email/email.module
+++ b/core/modules/email/email.module
@@ -35,13 +35,5 @@ function email_field_info_alter(&$info) {
$info['email']['class'] = '\Drupal\email\ConfigurableEmailItem';
$info['email']['list_class'] = '\Drupal\Core\Field\ConfigFieldItemList';
$info['email']['default_widget'] = 'email_default';
- $info['email']['default_formatter'] = 'email_mailto';
$info['email']['provider'] = 'email';
}
-
-/**
- * Implements hook_field_formatter_info_alter().
- */
-function email_field_formatter_info_alter(&$info) {
- $info['string']['field_types'][] = 'email';
-}
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php
index 1ab176b..e71d75b 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php
@@ -54,7 +54,7 @@ public function testValidation() {
$violations = $node->validate();
$this->assertEqual(count($violations), 1, 'Violation found when title is too long.');
$this->assertEqual($violations[0]->getPropertyPath(), 'title.0.value');
- $this->assertEqual($violations[0]->getMessage(), 'Title: the string may not be longer than 255 characters.');
+ $this->assertEqual($violations[0]->getMessage(), 'Title: may not be longer than 255 characters.');
$node->set('title', NULL);
$violations = $node->validate();
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
index ea717f0..4c4f6bc 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
@@ -106,7 +106,7 @@ public function testCreate() {
$response = $this->httpRequest('entity/' . $entity_type, 'POST', $invalid_serialized, $this->defaultMimeType);
$this->assertResponse(422);
$error = drupal_json_decode($response);
- $this->assertEqual($error['error'], "Unprocessable Entity: validation failed.\nuuid.0.value: UUID: the string may not be longer than 128 characters.\n");
+ $this->assertEqual($error['error'], "Unprocessable Entity: validation failed.\nuuid.0.value: UUID: may not be longer than 128 characters.\n");
// Try to create an entity without proper permissions.
$this->drupalLogout();
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
index 7c36aed..598401b 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
@@ -149,7 +149,7 @@ public function testPatchUpdate() {
$response = $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PATCH', $invalid_serialized, $this->defaultMimeType);
$this->assertResponse(422);
$error = drupal_json_decode($response);
- $this->assertEqual($error['error'], "Unprocessable Entity: validation failed.\nuuid.0.value: UUID: the string may not be longer than 128 characters.\n");
+ $this->assertEqual($error['error'], "Unprocessable Entity: validation failed.\nuuid.0.value: UUID: may not be longer than 128 characters.\n");
// Try to update an entity without proper permissions.
$this->drupalLogout();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
index 4e8ad8a..118abe9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
@@ -108,7 +108,7 @@ protected function checkValidation($entity_type) {
$test_entity->uuid->value = $this->randomString(129);
$violations = $test_entity->validate();
$this->assertEqual($violations->count(), 1, 'Validation failed.');
- $this->assertEqual($violations[0]->getMessage(), t('%name: the string may not be longer than @max characters.', array('%name' => 'UUID', '@max' => 128)));
+ $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'UUID', '@max' => 128)));
$test_entity = clone $entity;
$test_entity->langcode->value = $this->randomString(13);
@@ -126,7 +126,7 @@ protected function checkValidation($entity_type) {
$test_entity->name->value = $this->randomString(33);
$violations = $test_entity->validate();
$this->assertEqual($violations->count(), 1, 'Validation failed.');
- $this->assertEqual($violations[0]->getMessage(), t('%name: the string may not be longer than @max characters.', array('%name' => 'Name', '@max' => 32)));
+ $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'Name', '@max' => 32)));
// Make sure the information provided by a violation is correct.
$violation = $violations[0];
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermValidationTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermValidationTest.php
index 8d4af9b..009d871 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermValidationTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermValidationTest.php
@@ -57,7 +57,7 @@ public function testValidation() {
$this->assertEqual(count($violations), 1, 'Violation found when name is too long.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name.0.value');
$field_label = $term->get('name')->getFieldDefinition()->getLabel();
- $this->assertEqual($violations[0]->getMessage(), t('%name: the string may not be longer than @max characters.', array('%name' => $field_label, '@max' => 255)));
+ $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => 255)));
$term->set('name', NULL);
$violations = $term->validate();
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
index 0a2fc9e..02c8d4d 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
@@ -161,7 +161,7 @@ protected function assertLengthViolation(EntityInterface $entity, $field_name, $
$this->assertEqual(count($violations), 1, "Violation found when $field_name is too long.");
$this->assertEqual($violations[0]->getPropertyPath(), "$field_name.0.value");
$field_label = $entity->get($field_name)->getFieldDefinition()->getLabel();
- $this->assertEqual($violations[0]->getMessage(), t('%name: the string may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
+ $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
}
}