Changed emails files convention

misago/theme.py

@@ -56,8 +56,8 @@ class Theme(object):
         return unicode(_macro()).strip()
 
     def get_email_templates(self, template, contex={}):
-            email_type_plain = '_email/%s_plain.html' % template
-            email_type_html = '_email/%s_html.html' % template
+            email_type_plain = '_email/%s.txt' % template
+            email_type_html = '_email/%s.html' % template
             return (
                     select_template(('%s/%s' % (self._theme, email_type_plain[1:]), email_type_plain)),
                     select_template(('%s/%s' % (self._theme, email_type_html[1:]), email_type_html)),

templates/_email/private_thread_invite_html.html → templates/_email/private_thread_invite.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans %}You've been invited to private thread{% endtrans %}{% endblock %}
 

templates/_email/private_thread_invite_plain.html → templates/_email/private_thread_invite.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans %}You've been invited to private thread{% endtrans %}{% endblock %}
 

templates/_email/private_thread_reply_notification_html.html → templates/_email/private_thread_reply_notification.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans %}New reply notification{% endtrans %}{% endblock %}
 

templates/_email/private_thread_reply_notification_plain.html → templates/_email/private_thread_reply_notification.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans %}New reply notification{% endtrans %}{% endblock %}
 

templates/_email/thread_reply_notification_html.html → templates/_email/thread_reply_notification.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans %}New reply notification{% endtrans %}{% endblock %}
 

templates/_email/thread_reply_notification_plain.html → templates/_email/thread_reply_notification.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans %}New reply notification{% endtrans %}{% endblock %}
 

templates/_email/users/activation/admin_html.html → templates/_email/users/activation/admin.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block content %}
 {{ super() }}

templates/_email/users/activation/admin_plain.html → templates/_email/users/activation/admin.txt

@@ -1,4 +1,4 @@
-{% extends "_email/users/activation/none_plain.html" %}
+{% extends "_email/users/activation/none.txt" %}
 
 {% block content %}
 {{ super() }}

templates/_email/users/activation/admin_done_html.html → templates/_email/users/activation/admin_done.html

@@ -1,4 +1,4 @@
-{% extends "_email/users/activation/none_html.html" %}
+{% extends "_email/users/activation/none.html" %}
 
 {% block content %}
 <p {{ style_p|safe }}>{% trans username=user.username %}{{ username }}, you are receiving this message because board administrator has activated your account.{% endtrans %}</p>

templates/_email/users/activation/admin_done_plain.html → templates/_email/users/activation/admin_done.txt

@@ -1,4 +1,4 @@
-{% extends "_email/users/activation/none_plain.html" %}
+{% extends "_email/users/activation/none.txt" %}
 
 {% block content %}
 {% trans username=user.username %}{{ username }}, you are receiving this message because board administrator has activated your account.{% endtrans %}

templates/_email/users/activation/invalidated_html.html → templates/_email/users/activation/invalidated.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Account Activation on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/activation/invalidated_plain.html → templates/_email/users/activation/invalidated.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Account Activation on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/activation/none_html.html → templates/_email/users/activation/none.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Welcome aboard {{ board_name }}!{% endtrans %}{% endblock %}
 

templates/_email/users/activation/none_plain.html → templates/_email/users/activation/none.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Welcome aboard {{ board_name }}!{% endtrans %}{% endblock %}
 

templates/_email/users/activation/resend_html.html → templates/_email/users/activation/resend.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Account Activation on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/activation/resend_plain.html → templates/_email/users/activation/resend.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Account Activation on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/activation/user_html.html → templates/_email/users/activation/user.html

@@ -1,4 +1,4 @@
-{% extends "_email/users/activation/none_html.html" %}
+{% extends "_email/users/activation/none.html" %}
 
 {% block content %}
 {{ super() }}

templates/_email/users/activation/user_plain.html → templates/_email/users/activation/user.txt

@@ -1,4 +1,4 @@
-{% extends "_email/users/activation/none_plain.html" %}
+{% extends "_email/users/activation/none.txt" %}
 
 {% block content %}
 {{ super() }}

templates/_email/users/new_credentials_html.html → templates/_email/users/new_credentials.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Activate new Sign-In Credentials on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/new_credentials_plain.html → templates/_email/users/new_credentials.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Activate new Sign-In Credentials on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/newsletter_html.html → templates/_email/users/newsletter.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{{ subject }}{% endblock %}
 

templates/_email/users/newsletter_plain.html → templates/_email/users/newsletter.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{{ subject }}{% endblock %}
 

templates/_email/users/password/confirm_html.html → templates/_email/users/password/confirm.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Confirm New Password Request on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/password/confirm_plain.html → templates/_email/users/password/confirm.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Confirm New Password Request on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/password/new_html.html → templates/_email/users/password/new.html

@@ -1,4 +1,4 @@
-{% extends "_email/base_html.html" %}
+{% extends "_email/base.html" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Your New Password on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/password/new_plain.html → templates/_email/users/password/new.txt

@@ -1,4 +1,4 @@
-{% extends "_email/base_plain.html" %}
+{% extends "_email/base.txt" %}
 
 {% block title %}{% trans board_name=settings.board_name %}Your New Password on {{ board_name }}{% endtrans %}{% endblock %}
 

templates/_email/users/password/new_admin_html.html → templates/_email/users/password/new_admin.html

@@ -1,4 +1,4 @@
-{% extends "_email/users/password/new_html.html" %}
+{% extends "_email/users/password/new.html" %}
 
 {% block content %}
 <p {{ style_p|safe }}>{% trans username=user.username %}{{ username }}, you are receiving this message because board administrator has reset your account's password with new one.{% endtrans %}</p>

templates/_email/users/password/new_admin_plain.html → templates/_email/users/password/new_admin.txt

@@ -1,4 +1,4 @@
-{% extends "_email/users/password/new_plain.html" %}
+{% extends "_email/users/password/new.txt" %}
 
 {% block content %}
 {% trans username=user.username %}{{ username }}, you are receiving this message because board administrator has reset your account's password with new one.{% endtrans %}