all email letters have been refactored

babel.cfg

@@ -1,3 +1,4 @@
 [python: **.py]
+[jinja2: **/templates/**.txt]
 [jinja2: **/templates/**.html]
 extensions=jinja2.ext.autoescape,jinja2.ext.with_

forum/auth/views.py

@@ -1,4 +1,4 @@
-from flask import render_template, redirect, request, url_for, flash
+from flask import render_template, redirect, request, url_for, flash, current_app
 from flask_babel import lazy_gettext, gettext
 from flask_login import login_user, logout_user, login_required, current_user
 
@@ -14,8 +14,11 @@
 def check_confirmed():
     if current_user.is_authenticated:
         current_user.ping()
-        if (not current_user.confirmed and request.endpoint and
-                request.endpoint[:5] != 'auth.' and request.endpoint != 'static'):
+        if (not current_user.confirmed and
+                request.endpoint and
+                request.endpoint[:5] != 'auth.' and
+                request.endpoint != 'main.set_locale' and
+                request.endpoint != 'static'):
             return redirect(url_for('auth.unconfirmed'))
 
 
@@ -65,6 +68,12 @@ def register():
             body=render_template('auth/email/confirm.txt', user=user, token=token),
             html=render_template('auth/email/confirm.html', user=user, token=token)
         )
+        send_email.delay(
+            recipients=[current_app.config['APP_ADMIN']],
+            subject='New user',
+            body=render_template('email/new_user.txt', user=user),
+            html=render_template('email/new_user.html', user=user)
+        )
         flash(lazy_gettext('A confirmation email has been sent to you by email.'))
         return redirect(url_for('auth.login'))
     return render_template('auth/register.html', form=form)

forum/models.py

@@ -336,6 +336,7 @@ class PollVote(db.Model):
     created_at = db.Column(db.DateTime, default=func.now())
     deleted = db.Column(db.Boolean, index=True, default=False)
 
+
 db.event.listen(Message.body, 'set', on_changed_body_set_body_html)
 db.event.listen(Topic.body, 'set', on_changed_body_set_body_html)
 db.event.listen(Comment.body, 'set', on_changed_body_set_body_html)

forum/templates/auth/email/confirm.html

@@ -1,8 +1,14 @@
-<p>Dear {{ user.username }},</p>
-<p>Welcome to <b>4RUM</b>!</p>
-<p>To confirm your account please <a href="{{ url_for('auth.confirm', token=token, _external=True) }}">click here</a>.</p>
-<p>Alternatively, you can paste the following link in your browser's address bar:</p>
-<p>{{ url_for('auth.confirm', token=token, _external=True) }}</p>
-<p>Sincerely,</p>
-<p>The 4RUM Team</p>
-<p><small>Note: replies to this email address are not monitored.</small></p>
+{{ _('Dear') }} <b>{{ user.username }}</b>,
+<p>
+    {{ _('Welcome to <b>4RUM</b>!') }}
+    <br>{{ _('To confirm your account please') }} <a href="{{ url_for('auth.confirm', token=token, _external=True) }}">{{ _('click here') }}</a>.
+    <br>{{ _('Alternatively, you can paste the following link in your browser\'s address bar:') }}
+    <br>{{ url_for('auth.confirm', token=token, _external=True) }}
+</p>
+<p>
+    {{ _('Sincerely') }},
+    <br>{{ _('The 4RUM Team') }}
+</p>
+<p>
+    <small>{{ _('Note: replies to this email address are not monitored.') }}</small>
+</p>

forum/templates/auth/email/confirm.txt

@@ -1,13 +1,10 @@
-Dear {{ user.username }},
-
-Welcome to 4RUM!
-
-To confirm your account please click on the following link:
+{{ _('Dear') }} {{ user.username }},
 
+{{ _('Welcome to 4RUM!') }}
+{{ _('To confirm your account please click on the following link:') }}
 {{ url_for('auth.confirm', token=token, _external=True) }}
 
-Sincerely,
-
-The 4RUM Team
+{{ _('Sincerely') }},
+{{ _('The 4RUM Team') }}
 
-Note: replies to this email address are not monitored.
+{{ _('Note: replies to this email address are not monitored.') }}

forum/templates/auth/email/confirm_new_email.html

@@ -1,8 +1,14 @@
-<p>Dear {{ user.username }},</p>
-<p>You have changed your email for <b>4RUM</b> account.</p>
-<p>To confirm your new email please <a href="{{ url_for('auth.confirm_new_email', token=token, _external=True) }}">click here</a>.</p>
-<p>Alternatively, you can paste the following link in your browser's address bar:</p>
-<p>{{ url_for('auth.confirm_new_email', token=token, _external=True) }}</p>
-<p>Sincerely,</p>
-<p>The 4RUM Team</p>
-<p><small>Note: replies to this email address are not monitored.</small></p>
+{{ _('Dear') }} <b>{{ user.username }}</b>,
+<p>
+    {{ _('You have changed your email for <b>4RUM</b> account.') }}
+    <br>{{ _('To confirm your new email please') }} <a href="{{ url_for('auth.confirm_new_email', token=token, _external=True) }}">{{ _('click here') }}</a>.
+    <br>{{ _('Alternatively, you can paste the following link in your browser\'s address bar:') }}
+    <br>{{ url_for('auth.confirm_new_email', token=token, _external=True) }}
+</p>
+<p>
+    {{ _('Sincerely') }},
+    <br>{{ _('The 4RUM Team') }}
+</p>
+<p>
+    <small>{{ _('Note: replies to this email address are not monitored.') }}</small>
+</p>

forum/templates/auth/email/confirm_new_email.txt

@@ -1,13 +1,10 @@
-Dear {{ user.username }},
-
-You have changed your email for 4RUM account.
-
-To confirm your new email please click on the following link:
+{{ _('Dear') }} {{ user.username }},
 
+{{ _('You have changed your email for 4RUM account.') }}
+{{ _('To confirm your new email please click on the following link:') }}
 {{ url_for('auth.confirm_new_email', token=token, _external=True) }}
 
-Sincerely,
-
-The 4RUM Team
+{{ _('Sincerely') }},
+{{ _('The 4RUM Team') }}
 
-Note: replies to this email address are not monitored.
+{{ _('Note: replies to this email address are not monitored.') }}

forum/templates/auth/email/reset_password.html

@@ -1,9 +1,15 @@
-<p>Dear {{ user.username }},</p>
-<p>You have requested password reset for <b>4RUM</b> account.</p>
-<p>To reset your password please <a href="{{ url_for('auth.reset_password', token=token, _external=True) }}">click here</a>.</p>
-<p>Alternatively, you can paste the following link in your browser's address bar:</p>
-<p>{{ url_for('auth.reset_password', token=token, _external=True) }}</p>
-<p>If you have not requested a password reset simply ignore this message.</p>
-<p>Sincerely,</p>
-<p>The 4RUM Team</p>
-<p><small>Note: replies to this email address are not monitored.</small></p>
+{{ _('Dear') }} <b>{{ user.username }}</b>,
+<p>
+    {{ _('You have requested password reset for <b>4RUM</b> account.') }}
+    <br>{{ _('To reset your password please') }} <a href="{{ url_for('auth.reset_password', token=token, _external=True) }}">{{ _('click here') }}</a>.
+    <br>{{ _('Alternatively, you can paste the following link in your browser\'s address bar:') }}
+    <br>{{ url_for('auth.reset_password', token=token, _external=True) }}
+    <br>{{ _('If you have not requested a password reset simply ignore this message.') }}
+</p>
+<p>
+    {{ _('Sincerely') }},
+    <br>{{ _('The 4RUM Team') }}
+</p>
+<p>
+    <small>{{ _('Note: replies to this email address are not monitored.') }}</small>
+</p>

forum/templates/auth/email/reset_password.txt

@@ -1,15 +1,11 @@
-Dear {{ user.username }},
-
-You have requested password reset for 4RUM account.
-
-To reset your password please click on the following link:
+{{ _('Dear') }} {{ user.username }},
 
+{{ _('You have requested password reset for 4RUM account.') }}
+{{ _('To reset your password please click on the following link:') }}
 {{ url_for('auth.reset_password', token=token, _external=True) }}
+{{ _('If you have not requested a password reset simply ignore this message.') }}
 
-If you have not requested a password reset simply ignore this message.
-
-Sincerely,
-
-The 4RUM Team
+{{ _('Sincerely') }},
+{{ _('The 4RUM Team') }}
 
-Note: replies to this email address are not monitored.
+{{ _('Note: replies to this email address are not monitored.') }}

forum/templates/email/new_user.html

@@ -1 +1,6 @@
-User <b>{{ user.username }}</b> has joined.
+New user has joined.
+<p>
+    Username: {{ user.username }}
+    <br>Email: {{ user.email }}
+    <br>Profile: {{ url_for('main.user', username=user.username, _external=True) }}
+</p>

forum/templates/email/new_user.txt

@@ -1 +1,5 @@
-User {{ user.username }} has joined.
+New user has joined.
+
+Username: {{ user.username }}
+Email: {{ user.email }}
+Profile: {{ url_for('main.user', username=user.username, _external=True) }}