diff --git a/server/mail-templates/legacy/legacy_invite.html b/server/mail-templates/legacy/legacy_invite.html index 2f5f597657..d033271173 100644 --- a/server/mail-templates/legacy/legacy_invite.html +++ b/server/mail-templates/legacy/legacy_invite.html @@ -7,4 +7,4 @@

To accept the invite, please open the Ente Photos app, and navigate to Settings > Account > Legacy.

If you need help, please reply to this email.

-{{end}} \ No newline at end of file +{{end}} diff --git a/server/mail-templates/legacy/legacy_invite_accepted.html b/server/mail-templates/legacy/legacy_invite_accepted.html index 95624b8810..5044df609e 100644 --- a/server/mail-templates/legacy/legacy_invite_accepted.html +++ b/server/mail-templates/legacy/legacy_invite_accepted.html @@ -1,9 +1,9 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has accepted your request to be your trusted contact.

+

{{.TrustedContact}} has accepted your request to be your trusted contact.

-

As a trusted contact, {{.TrustedUser}} can recover your account in your absence.

+

As a trusted contact, {{.TrustedContact}} can recover your account in your absence.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/legacy_invite_rejected.html b/server/mail-templates/legacy/legacy_invite_rejected.html index 971e4c853c..e770025781 100644 --- a/server/mail-templates/legacy/legacy_invite_rejected.html +++ b/server/mail-templates/legacy/legacy_invite_rejected.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has rejected your request to be your trusted contact.

+

{{.TrustedContact}} has rejected your request to be a trusted contact.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email

+{{end}} diff --git a/server/mail-templates/legacy/legacy_invite_sent.html b/server/mail-templates/legacy/legacy_invite_sent.html index baf38445f8..16f2f2db42 100644 --- a/server/mail-templates/legacy/legacy_invite_sent.html +++ b/server/mail-templates/legacy/legacy_invite_sent.html @@ -1,10 +1,10 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

You have invited {{.TrustedyUser}} to be your trusted contact.

+

You have invited {{.TrustedContact}} to be your trusted contact.

-

As a trusted contact, {{.TrustedyUser}} can recover your account in your absence.

+

As a trusted contact, {{.TrustedContact}} can recover your account in your absence.

If you want to cancel the invite, please navigate to Settings -> Account -> Legacy in the Ente Photos app.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/legacy_left.html b/server/mail-templates/legacy/legacy_left.html index 72d03dd95b..4f065f6253 100644 --- a/server/mail-templates/legacy/legacy_left.html +++ b/server/mail-templates/legacy/legacy_left.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has removed themselves from being your trusted contact.

+

{{.TrustedContact}} has removed themselves from being your trusted contact.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/legacy_removed.html b/server/mail-templates/legacy/legacy_removed.html index 160dba288d..8b907a14d0 100644 --- a/server/mail-templates/legacy/legacy_removed.html +++ b/server/mail-templates/legacy/legacy_removed.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.TrustedUser}}!

+

Hello,

-

{{.LegacyUser}} has removed you as their trusted contact.

+

{{.LegacyContact}} has removed you as their trusted contact.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_cancelled.html b/server/mail-templates/legacy/recovery_cancelled.html index 0e2a2828fd..6dce235043 100644 --- a/server/mail-templates/legacy/recovery_cancelled.html +++ b/server/mail-templates/legacy/recovery_cancelled.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has cancelled the process of recovering your account

+

{{.TrustedUser}} has cancelled the process of recovering your account.

-

If you need help with anything, please write back!

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_completed_legacy.html b/server/mail-templates/legacy/recovery_completed_legacy.html index 4623393409..17d6f08f2b 100644 --- a/server/mail-templates/legacy/recovery_completed_legacy.html +++ b/server/mail-templates/legacy/recovery_completed_legacy.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has successfully changed password of your account.

+

{{.TrustedContact}} has changed the password and can now access your account. -

If you need help with anything, please write back!

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_completed_trusted.html b/server/mail-templates/legacy/recovery_completed_trusted.html index 1dc9a9bf9b..268569f4f6 100644 --- a/server/mail-templates/legacy/recovery_completed_trusted.html +++ b/server/mail-templates/legacy/recovery_completed_trusted.html @@ -1,8 +1,7 @@ {{define "content"}} -

Hey {{.TrustedContact}}!

+

Hello,

-

You can now access {{.LegacyContact}}'s account with the new password you setup on the Ente Photos app.

-

Please save the new password so that you can access the account in the future.

+

You can now access {{.LegacyContact}}'s account with the new password you setup on Ente.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need any help, please let us know by responding to this email, we'll be around.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_ready_legacy.html b/server/mail-templates/legacy/recovery_ready_legacy.html index 0b32083511..b521f69ab1 100644 --- a/server/mail-templates/legacy/recovery_ready_legacy.html +++ b/server/mail-templates/legacy/recovery_ready_legacy.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} can now recover your account by changing the password. +

{{.TrustedContact}} can now recover your account by changing the password. -

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_ready_trusted.html b/server/mail-templates/legacy/recovery_ready_trusted.html index 2eef93d54c..e688f8a605 100644 --- a/server/mail-templates/legacy/recovery_ready_trusted.html +++ b/server/mail-templates/legacy/recovery_ready_trusted.html @@ -1,8 +1,8 @@ {{define "content"}} -

Hey {{.TrustedUser}}!

+

Hello,

-

You can now recover {{.LegacyUser}}'s account.

-

To change the password to {{.LegacyUser}}'s account, please navigate to Settings -> Account -> Legacy in the Ente Photos app.

+

You can now recover {{.LegacyContact}}'s account.

+

To change the password to {{.LegacyContact}}'s account, please navigate to Settings > Account > Legacy in the Ente Photos app.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_rejected.html b/server/mail-templates/legacy/recovery_rejected.html index c2d7e62ebf..ecb56dd963 100644 --- a/server/mail-templates/legacy/recovery_rejected.html +++ b/server/mail-templates/legacy/recovery_rejected.html @@ -1,7 +1,7 @@ {{define "content"}} -

Hey {{.TrustedUser}}!

+

Hello,

-

{{.LegacyUser}} has blocked your request to recover their account as their trusted contact.

+

{{.LegacyContact}} has blocked your request to recover their account.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email

+{{end}} diff --git a/server/mail-templates/legacy/recovery_reminder.html b/server/mail-templates/legacy/recovery_reminder.html index dc74893bae..3c7a35c496 100644 --- a/server/mail-templates/legacy/recovery_reminder.html +++ b/server/mail-templates/legacy/recovery_reminder.html @@ -1,9 +1,9 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has initiated recovery on your account. After 2 days, they would be able to change the password and access your account.

+

{{.TrustedContact}} has initiated recovery on your account. After 2 days, they will be able to change the password and access your account.

-

If you want to block the recovery, please navigate to Settings -> Account -> Legacy in the Ente Photos app.

+

If you want to block the recovery, please navigate to Settings > Account > Legacy in the Ente Photos app.

-

If you need any help, please reply to this email or write to support@ente.io.

-{{end}} \ No newline at end of file +

If you need help, please reply to this email.

+{{end}} diff --git a/server/mail-templates/legacy/recovery_started.html b/server/mail-templates/legacy/recovery_started.html index 5136abc455..13a12c5ff8 100644 --- a/server/mail-templates/legacy/recovery_started.html +++ b/server/mail-templates/legacy/recovery_started.html @@ -1,7 +1,9 @@ {{define "content"}} -

Hey {{.LegacyUser}}!

+

Hello,

-

{{.TrustedUser}} has started the process to recover your account.

+

{{.TrustedContact}} has initiated recovery on your account. After 30 days, they will be able to change the password and access your account.

-

If you need help with anything, please write back!

-{{end}} \ No newline at end of file +

If you want to block the recovery, please navigate to Settings > Account > Legacy in the Ente Photos app.

+ +

If you need help, please reply to this email.

+{{end}}