Merged

emencia/django/newsletter/forms.py

@@ -108,7 +108,7 @@ class ContactFilterForm(forms.Form):
             title += " countries: %s" % ','.join([obj.url for obj in Country.objects.language().filter(id__in=self.cleaned_data['country'])])
         if self.cleaned_data.get('area'):
             qs = qs.filter(contactsettings__area__id__in=self.cleaned_data['area'])
-            title += " geo area: %s" % ','.join([obj.url for obj in Area.objects.language('en').filter(id__in=self.cleaned_data['area'])])
+            title += " geo area: %s" % ','.join([tr(obj.name) for obj in Area.objects.language('en').filter(id__in=self.cleaned_data['area'])])
         if self.cleaned_data.get('active'):
             title = ' active ' + title
             qs = qs.filter(activated=True)

emencia/django/newsletter/views/admin_views.py

@@ -4,6 +4,7 @@ from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.forms.formsets import BaseFormSet, formset_factory
 from django.http import HttpResponseRedirect, HttpResponse
+from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import get_object_or_404
 from HTMLParser import HTMLParseError
 from emencia.django.newsletter.models import Contact, ContactSettings, MailingList, Newsletter, Attachment
@@ -209,4 +210,4 @@ class ExportContacts(FormView):
             if qs.count():
                 columns = ('first_name', 'email')
                 return ExcelResponse(qs, title, columns,'contacts')
-        return HttpResponseRedirect(self.request.META['HTTP_REFERER'])
+        return HttpResponseRedirect(self.request.META['HTTP_REFERER'])