Projet

Général

Profil

0001-Use-template-name-format-as-stated-in-send_templated.patch

Mikaël Ates, 08 avril 2016 18:35

Télécharger (4,04 ko)

Voir les différences: 

Subject: [PATCH 1/1] Use template name format as stated in send_templated_mail
 for registration emails.


 src/authentic2/registration_backend/forms.py                     | 4 ++--
 src/authentic2/templates/registration/activation_email.html      | 8 --------
 src/authentic2/templates/registration/activation_email.txt       | 6 ------
 src/authentic2/templates/registration/activation_email_body.html | 8 ++++++++
 src/authentic2/templates/registration/activation_email_body.txt  | 6 ++++++
 5 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/authentic2/templates/registration/activation_email.html
 delete mode 100644 src/authentic2/templates/registration/activation_email.txt
 create mode 100644 src/authentic2/templates/registration/activation_email_body.html
 create mode 100644 src/authentic2/templates/registration/activation_email_body.txt
src/authentic2/registration_backend/forms.py
59 59 
                                   ctx_dict)
60 60 

  		




  61
  61
  
    
        subject = ''.join(subject.splitlines())

  		




  62
  
  
    
        message = render_to_string('registration/activation_email.txt',

  		




  
  62
  
    
        message = render_to_string('registration/activation_email_body.txt',

  		




  63
  63
  
    
                                   ctx_dict)

  		




  64
  64
  
    

  		




  65
  
  
    
        html_message = render_to_string('registration/activation_email.html',

  		




  
  65
  
    
        html_message = render_to_string('registration/activation_email_body.html',

  		




  66
  66
  
    
                                        ctx_dict)

  		




  67
  67
  
    
        send_mail(subject, message, settings.DEFAULT_FROM_EMAIL,

  		




  68
  68
  
    
                  [data['email']], fail_silently=True,

  		












  

    
      src/authentic2/templates/registration/activation_email.html
    
  





  1
  
  
    
{% load i18n %}

  		




  2
  
  
    
<html>

  		




  3
  
  
    
  <body style="width: 90ex">

  		




  4
  
  
    
    <p>{% blocktrans %}You created a new account on {{ site }}. To activate your account, please <a href="{{ registration_url }}">click here</a>{% endblocktrans %}

  		




  5
  
  
    
    </p>

  		




  6
  
  
    
    <p>{% blocktrans %}This link link is valid for {{ expiration_days }} days.{% endblocktrans %}</>

  		




  7
  
  
    
  </body>

  		




  8
  
  
    
</html>

  		












  

    
      src/authentic2/templates/registration/activation_email.txt
    
  





  1
  
  
    
{% load i18n %}

  		




  2
  
  
    
{% trans "Activate account" %}:

  		




  3
  
  
    

  		




  4
  
  
    
{{ registration_url }}

  		




  5
  
  
    

  		




  6
  
  
    
{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}

  		












  

    
      src/authentic2/templates/registration/activation_email_body.html
    
  





  
  1
  
    
{% load i18n %}

  		




  
  2
  
    
<html>

  		




  
  3
  
    
  <body style="width: 90ex">

  		




  
  4
  
    
    <p>{% blocktrans %}You created a new account on {{ site }}. To activate your account, please <a href="{{ registration_url }}">click here</a>{% endblocktrans %}

  		




  
  5
  
    
    </p>

  		




  
  6
  
    
    <p>{% blocktrans %}This link link is valid for {{ expiration_days }} days.{% endblocktrans %}</>

  		




  
  7
  
    
  </body>

  		




  
  8
  
    
</html>

  		












  

    
      src/authentic2/templates/registration/activation_email_body.txt
    
  





  
  1
  
    
{% load i18n %}

  		




  
  2
  
    
{% trans "Activate account" %}:

  		




  
  3
  
    

  		




  
  4
  
    
{{ registration_url }}

  		




  
  5
  
    

  		




  
  6
  
    
{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}

  		




  0
  
  
    
-