fix

[wolnelektury.git] / src / newsletter / views.py

diff --git a/src/newsletter/views.py b/src/newsletter/views.py
index fd932d5..6c90873 100644 (file)
--- a/src/newsletter/views.py
+++ b/src/newsletter/views.py
@@ -1,31 +1,33 @@
-# -*- coding: utf-8 -*-
-from django.core.urlresolvers import reverse
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.http import Http404
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
 from django.http import Http404
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404

+from django.urls import reverse

 from django.utils.translation import ugettext_lazy as _
 
 from newsletter.forms import UnsubscribeForm, SubscribeForm
 from newsletter.models import Subscription
 
 
 from django.utils.translation import ugettext_lazy as _
 
 from newsletter.forms import UnsubscribeForm, SubscribeForm
 from newsletter.models import Subscription
 
 

-def subscribe_form(request):
+def subscribe_form(request, mailing_list='general', title=None):

     if request.POST:
     if request.POST:

-        form = SubscribeForm(request.POST)
+        form = SubscribeForm(mailing_list, request.POST)

         if form.is_valid():
             form.save()
             return HttpResponseRedirect(reverse('subscribed'))
     else:
         if form.is_valid():
             form.save()
             return HttpResponseRedirect(reverse('subscribed'))
     else:

-        form = SubscribeForm()
+        form = SubscribeForm(mailing_list)

     return render(request, 'newsletter/subscribe_form.html', {
     return render(request, 'newsletter/subscribe_form.html', {

-        'page_title': _(u'Subscribe'),
+        'page_title': title or _('Subscribe To Newsletter'),

         'form': form,
     })
 
 
 def subscribed(request):
     return render(request, 'newsletter/subscribed.html', {
         'form': form,
     })
 
 
 def subscribed(request):
     return render(request, 'newsletter/subscribed.html', {

-        'page_title': _(u'Confirmation link sent'),
+        'page_title': _('Subscribed'),

     })
 
 
     })
 
 


@@ -40,7 +42,7 @@ def confirm_subscription(request, subscription_id, hashcode):
     subscription.active = True
     subscription.save()
     return render(request, 'newsletter/confirm_subscription.html', {
     subscription.active = True
     subscription.save()
     return render(request, 'newsletter/confirm_subscription.html', {

-        'page_title': _(u'Subscription confirmed')
+        'page_title': _('Subscription confirmed')

     })
 
 
     })
 
 


@@ -53,12 +55,12 @@ def unsubscribe_form(request):
     else:
         form = UnsubscribeForm()
     return render(request, 'newsletter/unsubscribe_form.html', {
     else:
         form = UnsubscribeForm()
     return render(request, 'newsletter/unsubscribe_form.html', {

-        'page_title': _(u'Unsubscribe'),
+        'page_title': _('Unsubscribe'),

         'form': form,
     })
 
 
 def unsubscribed(request):
     return render(request, 'newsletter/unsubscribed.html', {
         'form': form,
     })
 
 
 def unsubscribed(request):
     return render(request, 'newsletter/unsubscribed.html', {

-        'page_title': _(u'Unsubscribed'),
+        'page_title': _('Unsubscribed'),

     })
     })