Re-phrase user e-mails

snf-astakos-app/astakos/im/templates/im/activation_email.txt

 {% extends "im/email.txt" %}
-  
+
 {% block content %}
 Dear {{ user.realname }},
 
-After your request a new account for {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }} service has been created.
+After your request a new account for {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }} service has been
+created.
 
-To proceed with your account activation we require you to verify the email 
+To proceed with your account activation we require you to verify the e-mail
 address you provided during the signup process.
 
-Please click the link below to complete verification: 
-
+Please click the link below to complete verification:
 {{ url }}
 
-If you did not sign up for this account you can ignore this email and the 
-account will be deleted. 
+If you did not sign up for this account you can ignore this e-mail and the
+account will be deleted.
 {% endblock %}
 
 {% block note %} {% endblock%}

snf-astakos-app/astakos/im/templates/im/email.txt

-{% block content %} {% endblock %}
-
-{% block note %}{% endblock note %}
-For any remarks or problems you may contact {{ support|safe }}.
+{% block content %}{% endblock %}{% block note %}{% endblock note %}
+For any remarks or problems you may contact {{ support }}.
 
 Thank you for participating in {{ BRANDING_SERVICE_NAME }}.
 

snf-astakos-app/astakos/im/templates/im/invitation.txt

@@ -5,5 +5,6 @@ Dear {{ invitation.realname }},
 
 {{ invitation.inviter.realname }} has invited you to use {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }} service.
 
-To access the service, please use the link: {{ url }}
+To access the service, please use the link:
+{{ url }}
 {% endblock %}

snf-astakos-app/astakos/im/templates/im/projects/project_approval_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Your application for project {{object.chain.realname}} has been approved.
-{% endblock  %}
+Dear {{ object.applicant.realname }},
+
+Your project application request ({{ object.chain.realname }}) has been approved.
+{% endblock %}

snf-astakos-app/astakos/im/templates/im/projects/project_denial_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Your application for project {{object.chain.realname}} has been denied.
+Dear {{ object.applicant.realname }},
 
+Your project application request ({{ object.chain.realname }}) has been denied.
 Comment:
-{{object.response}}
-
-{% endblock content %}
+{{ object.response }}
+{% endblock %}

snf-astakos-app/astakos/im/templates/im/projects/project_membership_change_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Your project membership ({{object.name}}) has been {{action}}.
-{% endblock content %}
\ No newline at end of file
+Dear {{ user.realname }},
+
+Your project membership ({{ object.name }}) has been {{ action }}.
+{% endblock content %}

snf-astakos-app/astakos/im/templates/im/projects/project_membership_enroll_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-You have been enrolled in project {{object.name}}.
-{% endblock content %}
\ No newline at end of file
+Dear {{ user.realname }},
+
+You have been enrolled in project {{ object.name }}.
+{% endblock content %}

snf-astakos-app/astakos/im/templates/im/projects/project_membership_leave_request_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-User {{user}} requests to leave project {{object.name}}.
-{% endblock content %}
\ No newline at end of file
+Dear {{ object.owner.realname }},
+
+User {{ user }} requests to leave project {{ object.name }}.
+{% endblock content %}

snf-astakos-app/astakos/im/templates/im/projects/project_membership_request_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-User {{user}} requests to join project {{object.name}}.
-{% endblock content %}
\ No newline at end of file
+Dear {{ object.owner.realname }},
+
+User {{ user }} requests to join project {{ object.name }}.
+{% endblock %}

snf-astakos-app/astakos/im/templates/im/projects/project_reinstatement_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Your terminated project {{object.realname}} has been reinstated.
+Dear {{ object.owner.realname }},
+
+Your terminated project {{object.name}} has been reinstated.
 {% endblock content %}

snf-astakos-app/astakos/im/templates/im/projects/project_suspension_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Your project {{object.realname}} has been suspended.
-{% endblock content %}
+Dear {{ object.owner.realname }},
+
+Your project ({{ object.name }}) has been suspended.
+{% endblock %}

snf-astakos-app/astakos/im/templates/im/projects/project_termination_notification.txt

 {% extends "im/email.txt" %}
   
 {% block content %}
-Your project {{object.realname}} has been terminated.
-{% endblock content %}
+Dear {{ object.owner.realname }},
+
+Your project ({{ object.realname }}) has been terminated.
+{% endblock %}

snf-astakos-app/astakos/im/templates/im/projects/project_unsuspension_notification.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Your suspended project {{object.realname}} has been resumed.
+Dear {{ object.owner.realname }},
+
+Your suspended project {{object.name}} has been resumed.
 {% endblock content %}

snf-astakos-app/astakos/im/templates/im/switch_accounts_email.txt

 {% extends "im/email.txt" %}
 
-
 {% block content %}
 Dear {{ user.realname }},
 
-We received a request for associating the specific email address with a shibboleth account for {{ BRANDING_COMPANY_NAME }}'s {{ BRANDING_SERVICE_NAME }} service.
+We received a request for associating the specific email address with a
+shibboleth account for {{ BRANDING_COMPANY_NAME }}'s {{ BRANDING_SERVICE_NAME }} service.
 However this email is already associated with another local account.
-In order to switch the existing account to a shibboleth one, use the link: {{ url }}
-Otherwise, just ignore this email.
 
+In order to switch the existing account to a shibboleth one, use the link:
+{{ url }}
+
+Otherwise, just ignore this email.
 {% endblock %}
 
 {% block note %} {% endblock%}

snf-astakos-app/astakos/im/templates/im/welcome_email.txt

@@ -3,7 +3,8 @@
 {% block content %}
 Dear {{ user.realname }},
 
-Your account for {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }} has been activated.
+Your account for {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }} service has been activated.
 
-To login, please use the link: {{ url }}
-{% endblock %}
\ No newline at end of file
+To login, please use the link:
+{{ url }}
+{% endblock %}

snf-astakos-app/astakos/im/templates/registration/email_change_email_new_email.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-Recipient: {{ ec.new_email_address }}
+Dear {{ ec.user.realname }},
 
-The user '{{ ec.user.email }}', most likely owned by you, requested to assign 
-the email address '{{ ec.new_email_address }}' with the corresponding 
-{{ BRANDING_SERVICE_NAME }} account.
-
-To confirm the change of the email please visit the following link:
+The user '{{ ec.user.email }}', most likely owned by you, requested to assign
+the email address '{{ ec.new_email_address }}' with the corresponding {{ BRANDING_SERVICE_NAME }}
+account.
 
+To confirm the change of the e-mail please visit the following link:
 {{ url }}
 
-In case you are not aware of the email change request please ignore this
+In case you are not aware of the e-mail change request please ignore this
 message.
 {% endblock %}
 

snf-astakos-app/astakos/im/templates/registration/email_change_email_old_email.txt

@@ -3,9 +3,11 @@
 {% block content %}
 Dear {{ ec.user.realname }},
 
-You recently requested to modify the e-mail that is used for your {{ BRANDING_SERVICE_NAME }} account from {{ ec.user.email }} to {{ ec.new_email_address }}.
+You recently requested to modify the e-mail that is used for your
+{{ BRANDING_SERVICE_NAME }} account from '{{ ec.user.email }}' to '{{ ec.new_email_address }}'.
 
-In case you are not aware of the e-mail change request please contact {{ support }} as soon as possible.
+In case you are not aware of the e-mail change request please contact {{ support }}
+as soon as possible.
 {% endblock %}
 
 {% block note %}{% endblock%}

snf-astakos-app/astakos/im/templates/registration/password_email.txt

 {% extends "im/email.txt" %}
 
 {% block content %}
-To reset your password for {{ BRANDING_COMPANY_NAME|upper }}'s {{ BRANDING_SERVICE_NAME }}, please use the following link:
+Dear {{ user.realname }},
 
+To reset your password for your {{ BRANDING_SERVICE_NAME }} account, you can use
+the link:
 {{ url }}
-
 {% endblock %}