EZP-29684: Remove the hyphen from the "E-mail" in whole application (#…

…255)
ezsystems · Oct 3, 2018 · bcce41b · bcce41b
1 parent 23bb2ff
commit bcce41b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/bundle/Resources/translations/ezrepoforms_content.en.xlf b/bundle/Resources/translations/ezrepoforms_content.en.xlf
@@ -12,8 +12,8 @@
         <note>key: content.cancel_button</note>
       </trans-unit>
       <trans-unit id="db5d6f82fe5ba6f40d1d159dca89c659c76aad06" resname="content.field_type.ezauthor.email">
-        <source>E-mail</source>
-        <target>E-mail</target>
+        <source>Email</source>
+        <target>Email</target>
         <note>key: content.field_type.ezauthor.email</note>
       </trans-unit>
       <trans-unit id="05fe48833d61c38f4c532c34c4b6fdad323e1fe1" resname="content.field_type.ezauthor.name">
@@ -32,8 +32,8 @@
         <note>key: content.field_type.ezurl.text</note>
       </trans-unit>
       <trans-unit id="7a3eb3ea13db1c9d6a0bd64c7d249a45e7b83b52" resname="content.field_type.ezuser.email">
-        <source>E-mail</source>
-        <target>E-mail</target>
+        <source>Email</source>
+        <target>Email</target>
         <note>key: content.field_type.ezuser.email</note>
       </trans-unit>
       <trans-unit id="8ac4ec40153c80fd39d2051802e30ebffb6f1fe1" resname="content.field_type.ezuser.enabled">

diff --git a/features/FieldTypeForm/user_fieldtype_edit_form.feature b/features/FieldTypeForm/user_fieldtype_edit_form.feature
@@ -14,7 +14,7 @@ Scenario: The attributes of a user field have a form representation
          | Username | text |
          | Password | password |
          | Confirm password | password |
-         | E-mail | email |
+         | Email | email |
 
 Scenario: The input fields are flagged as required when the field definition is required
     Given the field definition is marked as required

diff --git a/lib/Form/Type/FieldType/Author/AuthorEntryType.php b/lib/Form/Type/FieldType/Author/AuthorEntryType.php
@@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'email',
                 EmailType::class,
                 [
-                    'label' => /** @Desc("E-mail") */
+                    'label' => /** @Desc("Email") */
                         'content.field_type.ezauthor.email',
                     'required' => $options['required'],
                 ]

diff --git a/lib/Form/Type/FieldType/UserAccountFieldType.php b/lib/Form/Type/FieldType/UserAccountFieldType.php
@@ -35,19 +35,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('username', TextType::class, [
-                'label' => 'content.field_type.ezuser.username',
+                'label' => /** @Desc("Username") */ 'content.field_type.ezuser.username',
                 'required' => true,
                 'attr' => $isUpdateForm ? ['disabled' => 'disabled'] : [],
             ])
             ->add('password', RepeatedType::class, [
                 'type' => PasswordType::class,
                 'required' => !$isUpdateForm,
-                'first_options' => ['label' => 'content.field_type.ezuser.password'],
-                'second_options' => ['label' => 'content.field_type.ezuser.password_confirm'],
+                'first_options' => ['label' => /** @Desc("Password") */ 'content.field_type.ezuser.password'],
+                'second_options' => ['label' => /** @Desc("Confirm password") */ 'content.field_type.ezuser.password_confirm'],
             ])
             ->add('email', EmailType::class, [
                 'required' => true,
-                'label' => 'content.field_type.ezuser.email',
+                'label' => /** @Desc("Email") */ 'content.field_type.ezuser.email',
             ]);
 
         if (in_array($options['intent'], ['create', 'update'], true)) {