Skip to content

Commit 9d05fd9

Browse files
OstafinLOstafinL
committed
Fixed email template
1 parent ab7e76e commit 9d05fd9

File tree

4 files changed

+77
-32
lines changed

4 files changed

+77
-32
lines changed

‎src/bundle/Resources/translations/ibexa_forgot_password.en.xliff‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,31 @@
3737
<p>If you reset your password multiple times, only the most recent password reset link will be valid.</p>]]></target>
3838
<note>key: ezplatform.forgot_password.success</note>
3939
</trans-unit>
40+
<trans-unit id="3055d29b5833fba2c374b4a30fb66bf35e3df48a" resname="forgot_password.reset_your_password">
41+
<source>Reset your password</source>
42+
<target state="new">Reset your password</target>
43+
<note>key: forgot_password.reset_your_password</note>
44+
</trans-unit>
45+
<trans-unit id="e7b58c781e23a49ce354cdb479f14d6f75ca6e4f" resname="forgot_user_password.mail.message">
46+
<source>We have received a request to reset the password for your account. Click "reset password" below to choose a new password:</source>
47+
<target state="new">We have received a request to reset the password for your account. Click "reset password" below to choose a new password:</target>
48+
<note>key: forgot_user_password.mail.message</note>
49+
</trans-unit>
50+
<trans-unit id="26ccb574b6cd1e49d40d32d9183db89065138be2" resname="forgot_user_password.mail.message_footer">
51+
<source>If you did not request a password reset, please ignore this email, and your password will remain the same.</source>
52+
<target state="new">If you did not request a password reset, please ignore this email, and your password will remain the same.</target>
53+
<note>key: forgot_user_password.mail.message_footer</note>
54+
</trans-unit>
55+
<trans-unit id="a5ba92910b3dc61efc12c4f42cc869975be98723" resname="forgot_user_password.mail.message_title">
56+
<source>Hello,</source>
57+
<target state="new">Hello,</target>
58+
<note>key: forgot_user_password.mail.message_title</note>
59+
</trans-unit>
60+
<trans-unit id="b7293d1f766a95b50cf3e076c5ef4cd623dc542c" resname="forgot_user_password.mail.reset_password">
61+
<source>Reset password</source>
62+
<target state="new">Reset password</target>
63+
<note>key: forgot_user_password.mail.reset_password</note>
64+
</trans-unit>
4065
</body>
4166
</file>
4267
</xliff>

‎src/bundle/Resources/translations/ibexa_user_invitation.en.xliff‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
77
</header>
88
<body>
9+
<trans-unit id="07c52e99431e40b768788c64536e4dc12ade0f03" resname="ibexa.user.invitation.mail.join">
10+
<source>Join</source>
11+
<target state="new">Join</target>
12+
<note>key: ibexa.user.invitation.mail.join</note>
13+
</trans-unit>
914
<trans-unit id="bc254dd11e21f88f3d7b2a1a9c8ab30bb6825702" resname="ibexa.user.invitation.mail.message">
1015
<source xml:space="preserve">Hello,
1116
Join us at: %invite_link%
@@ -15,6 +20,11 @@
1520
</target>
1621
<note>key: ibexa.user.invitation.mail.message</note>
1722
</trans-unit>
23+
<trans-unit id="56996e20d695f581a1344e83a8c542c7df1a04ec" resname="ibexa.user.invitation.mail.message_title">
24+
<source>Hello,</source>
25+
<target state="new">Hello,</target>
26+
<note>key: ibexa.user.invitation.mail.message_title</note>
27+
</trans-unit>
1828
<trans-unit id="54fce872265c3912727c793b582ab71318d2294e" resname="ibexa.user.invitation.mail.subject">
1929
<source>You are invited to join</source>
2030
<target state="new">You are invited to join</target>

‎src/bundle/Resources/views/forgot_password/mail/forgot_user_password.html.twig‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
{% trans_default_domain 'ibexa_forgot_password' %}
1+
{% extends '@ibexadesign/ui/mail/base_mail_template.html.twig' %}
22

3-
{%- block from -%}
4-
{%- endblock from -%}
3+
{% trans_default_domain 'ibexa_forgot_password' %}
54

65
{%- block subject -%}
7-
{{ 'ezplatform.forgot_password.reset_your_password'|trans|desc('Reset your password') }}
6+
{{ 'forgot_password.reset_your_password'|trans|desc('Reset your password') }}
87
{%- endblock subject -%}
98

10-
{%- block body -%}
11-
<p>
12-
{{ 'ezplatform.forgot_password.message'|trans({ '%reset_password%': url('ibexa.user.reset_password', {'hashKey': hash_key}) })|raw
13-
|desc('Hello,
14-
<br /><br />
15-
We have received a request to reset the password for your account. Click “reset password” below to choose a new password:
16-
<br /><br />
17-
<a href="%reset_password%">Reset password<a/>
18-
<br /><br />
19-
If you did not request a password reset, please ignore this email, and your password will remain the same.') }}
20-
</p>
21-
{%- endblock body -%}
9+
{%- block mail_message_title_content -%}
10+
{{ 'forgot_user_password.mail.message_title'|trans()|desc('Hello,') }}
11+
{%- endblock mail_message_title_content -%}
12+
13+
{%- block mail_message_content %}
14+
{{ 'forgot_user_password.mail.message'|trans()|desc('We have received a request to reset the password for your account. Click "reset password" below to choose a new password:') }}
15+
{%- endblock mail_message_content %}
16+
17+
{%- block mail_actions_content -%}
18+
{% include '@ibexadesign/ui/mail/components/action_btn.html.twig' with {
19+
url: url('ibexa.user.reset_password', {'hashKey': hash_key}),
20+
label: 'forgot_user_password.mail.reset_password'|trans()|desc('Reset password')
21+
} only %}
22+
{%- endblock mail_actions_content -%}
23+
24+
{%- block mail_footer_content -%}
25+
{{ 'forgot_user_password.mail.message_footer'|trans()|desc('If you did not request a password reset, please ignore this email, and your password will remain the same.') }}
26+
{%- endblock mail_footer_content -%}

‎src/bundle/Resources/views/invitation/mail/user_invitation.html.twig‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
1-
{% trans_default_domain 'ibexa_user_invitation' %}
1+
{% extends '@ibexadesign/ui/mail/base_mail_template.html.twig' %}
22

3-
{%- block from -%}
4-
{%- endblock from -%}
3+
{% trans_default_domain 'ibexa_user_invitation' %}
54

65
{%- block subject -%}
76
{{ 'ibexa.user.invitation.mail.subject'|trans|desc('You are invited to join') }}
87
{%- endblock subject -%}
98

10-
{%- block body -%}
11-
<p>
12-
{{ 'ibexa.user.invitation.mail.message'|trans({
13-
'%invite_link%': url('ibexa.user.from_invite.register', {
14-
'inviteHash': invite_hash,
15-
'siteaccess': siteaccess
16-
})
17-
})|raw
18-
|desc('Hello,
19-
Join us at: %invite_link%
20-
') }}
21-
</p>
22-
{%- endblock body -%}
9+
{%- block mail_message_title_content -%}
10+
{{ 'ibexa.user.invitation.mail.message_title'|trans()|desc('Hello,') }}
11+
{%- endblock mail_message_title_content -%}
12+
13+
{%- block mail_message_content -%}
14+
{{ 'ibexa.user.invitation.mail.message'|trans()|desc('Join us at:') }}
15+
{%- endblock mail_message_content -%}
16+
17+
{%- block mail_actions_content -%}
18+
{% include '@ibexadesign/ui/mail/components/action_btn.html.twig' with {
19+
url: url('ibexa.user.from_invite.register', {
20+
'inviteHash': invite_hash,
21+
'siteaccess': siteaccess
22+
}),
23+
label: 'ibexa.user.invitation.mail.join'|trans()|desc('Join')
24+
} %}
25+
{%- endblock mail_actions_content -%}
26+
27+
{%- block mail_footer -%}{%- endblock mail_footer -%}

0 commit comments

Comments
 (0)