From 7e22512bc996cf6e805989b86f0b8c7eda80ff5f Mon Sep 17 00:00:00 2001 From: Jan Walther Date: Mon, 7 Feb 2022 08:02:56 +0100 Subject: [PATCH 1/2] clearer form label when resetting password --- .../CustomerBundle/Form/Type/ResetPasswordType.php | 4 ++-- .../Resources/install/pimcore/translations.yml | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php b/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php index c2f7c0e222..7c8a2e579f 100644 --- a/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php +++ b/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php @@ -27,8 +27,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('password', RepeatedType::class, [ 'type' => PasswordType::class, - 'first_options' => ['label' => 'coreshop.form.customer.password'], - 'second_options' => ['label' => 'coreshop.form.customer.password_repeat'], + 'first_options' => ['label' => 'coreshop.form.customer.password_new'], + 'second_options' => ['label' => 'coreshop.form.customer.password_new_repeat'], ]); } diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml b/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml index e2b9b4d1c0..574e924f91 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml @@ -1294,6 +1294,20 @@ translations: de: 'Passwort wiederholen' it: 'Ripeti la password' + coreshop.form.customer.password_new: + languages: + de_CH: 'Neues Passwort' + en: 'New Password' + de: 'Neues Passwort' + it: 'Nuovu Password' + + coreshop.form.customer.password_new_repeat: + languages: + de_CH: 'Neues Passwort wiederholen' + en: 'Repeat new Password' + de: 'Neues Passwort wiederholen' + it: 'Ripeti la nuovu password' + coreshop.form.customer.new_password: languages: de_CH: 'Neues Passwort' From 3bcb4491eaeae8e5e2c8974d8c7d5b872a44d0c4 Mon Sep 17 00:00:00 2001 From: Jan Walther Date: Mon, 7 Feb 2022 08:08:03 +0100 Subject: [PATCH 2/2] clearer form label when resetting password --- .../CustomerBundle/Form/Type/ResetPasswordType.php | 4 ++-- .../Resources/install/pimcore/translations.yml | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php b/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php index 7c8a2e579f..6c120516b6 100644 --- a/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php +++ b/src/CoreShop/Bundle/CustomerBundle/Form/Type/ResetPasswordType.php @@ -27,8 +27,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('password', RepeatedType::class, [ 'type' => PasswordType::class, - 'first_options' => ['label' => 'coreshop.form.customer.password_new'], - 'second_options' => ['label' => 'coreshop.form.customer.password_new_repeat'], + 'first_options' => ['label' => 'coreshop.form.customer.new_password'], + 'second_options' => ['label' => 'coreshop.form.customer.new_password_repeat'], ]); } diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml b/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml index 574e924f91..e2b9b4d1c0 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/install/pimcore/translations.yml @@ -1294,20 +1294,6 @@ translations: de: 'Passwort wiederholen' it: 'Ripeti la password' - coreshop.form.customer.password_new: - languages: - de_CH: 'Neues Passwort' - en: 'New Password' - de: 'Neues Passwort' - it: 'Nuovu Password' - - coreshop.form.customer.password_new_repeat: - languages: - de_CH: 'Neues Passwort wiederholen' - en: 'Repeat new Password' - de: 'Neues Passwort wiederholen' - it: 'Ripeti la nuovu password' - coreshop.form.customer.new_password: languages: de_CH: 'Neues Passwort'