Skip to content

Commit

Permalink
* Fix the email tempalte path.
Browse files Browse the repository at this point in the history
* Use the translation for the email subject.
  • Loading branch information
bgroff committed Nov 1, 2018
1 parent 9c1b568 commit caf3fd5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
5 changes: 3 additions & 2 deletions django_kala/projects/tasks/export_document.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.conf import settings
from django.contrib.auth import get_user_model
from django.utils.crypto import get_random_string
from django.utils.translation import ugettext as _

from documents.models import Document
from projects.models import Export
Expand Down Expand Up @@ -66,8 +67,8 @@ def run(self, *args, **kwargs):
# Send a notification to download
user.send_invite(
settings.EMAIL_APP,
'document_export',
'Document Export',
'email/document_export',
_('Document Export'),
export
)

Expand Down
5 changes: 3 additions & 2 deletions django_kala/projects/tasks/export_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.conf import settings
from django.contrib.auth import get_user_model
from django.utils.crypto import get_random_string
from django.utils.translation import ugettext as _

from projects.models import Project, Export

Expand Down Expand Up @@ -64,8 +65,8 @@ def run(self, *args, **kwargs):
# Send a notification to download
user.send_invite(
settings.EMAIL_APP,
'project_export',
'Project Export',
'email/project_export',
_('Project Export'),
export
)

Expand Down
2 changes: 2 additions & 0 deletions django_kala/projects/views/documents/document.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.shortcuts import get_object_or_404, redirect
Expand Down Expand Up @@ -52,6 +53,7 @@ def dispatch(self, request, project_pk, document_pk, *args, **kwargs):
def get(self, request, *args, **kwargs):
task = ExportDocumentTask()
task.apply_async([self.document.pk, request.user.pk], queue=settings.EXPORT_QUEUE)
messages.success(request, _('Your document has been scheduled for export. You will receive a download notification shortly.'))

return redirect(
reverse(
Expand Down
2 changes: 1 addition & 1 deletion django_kala/projects/views/projects/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def dispatch(self, request, pk, *args, **kwargs):
def get(self, request, *args, **kwargs):
task = ExportProjectTask()
task.apply_async([self.project.pk, request.user.pk], queue=settings.EXPORT_QUEUE)
messages.success(_('You project has been scheduled for export. You will receive a download notification shortly.'))
messages.success(request, _('Your project has been scheduled for export. You will receive a download notification shortly.'))

return redirect(
reverse(
Expand Down

0 comments on commit caf3fd5

Please sign in to comment.