merged with master branch

1 files changed, 4 insertions, 3 deletions

diff --git a/forum_modules/localauth/views.py b/forum_modules/localauth/views.py
index 1d1e0b3d..db71e902 100755
--- a/forum_modules/localauth/views.py
+++ b/forum_modules/localauth/views.py
@@ -1,10 +1,11 @@
 from django.contrib.auth.models import User
 from django.shortcuts import render_to_response
 from django.template import RequestContext
+from django.utils.translation import ugettext as _
 
 from forms import ClassicRegisterForm
 from forum.authentication.forms import SimpleEmailSubscribeForm
-from forum.views.auth import login_and_forward
+from forum.views.auth import login_and_forward, send_validation_email
 
 def register(request):
     if request.method == 'POST':
@@ -17,9 +18,9 @@ def register(request):
             email = form.cleaned_data['email']
 
             user_ = User.objects.create_user( username,email,password )
+            send_validation_email(user_)
             email_feeds_form.save(user_)
-            #todo: email validation
-            return login_and_forward(request, user_)
+            return login_and_forward(request, user_, None, _("A validation email has been sent to your email address. "))
     else:
         form = ClassicRegisterForm(initial={'next':'/'})
         email_feeds_form = SimpleEmailSubscribeForm()