From 50413abf7684e8f0873885b007932a79ab57ae88 Mon Sep 17 00:00:00 2001 From: Skia Date: Mon, 27 Mar 2017 15:16:01 +0200 Subject: [PATCH] Fix a weekmail deleteview, and make some translate fix --- com/views.py | 1 + core/views/files.py | 6 +++--- locale/fr/LC_MESSAGES/django.po | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/com/views.py b/com/views.py index 610d6968..b3107c99 100644 --- a/com/views.py +++ b/com/views.py @@ -347,6 +347,7 @@ class WeekmailArticleDeleteView(CanEditPropMixin, DeleteView): """Delete an article""" model = WeekmailArticle template_name = 'core/delete_confirm.jinja' + success_url = reverse_lazy('com:weekmail') pk_url_kwarg = "article_id" diff --git a/core/views/files.py b/core/views/files.py index 1885561b..0d4179bb 100644 --- a/core/views/files.py +++ b/core/views/files.py @@ -7,7 +7,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.forms.models import modelform_factory from django.forms import CheckboxSelectMultiple from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.http import HttpResponse from django.core.servers.basehttp import FileWrapper from django.core.urlresolvers import reverse @@ -118,8 +118,8 @@ class FileEditPropForm(forms.ModelForm): model = SithFile fields = ['parent', 'owner', 'edit_groups', 'view_groups'] parent = make_ajax_field(SithFile, 'parent', 'files', help_text="") - edit_groups = make_ajax_field(SithFile, 'edit_groups', 'groups', help_text="") - view_groups = make_ajax_field(SithFile, 'view_groups', 'groups', help_text="") + edit_groups = make_ajax_field(SithFile, 'edit_groups', 'groups', help_text="", label=_("edit group")) + view_groups = make_ajax_field(SithFile, 'view_groups', 'groups', help_text="", label=_("view group")) recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False) class FileEditPropView(CanEditPropMixin, UpdateView): diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 581f149b..0316fd43 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-27 14:21+0200\n" +"POT-Creation-Date: 2017-03-27 15:09+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -1676,11 +1676,11 @@ msgstr "miniature" msgid "owner" msgstr "propriétaire" -#: core/models.py:546 core/models.py:755 +#: core/models.py:546 core/models.py:755 core/views/files.py:121 msgid "edit group" msgstr "groupe d'édition" -#: core/models.py:547 core/models.py:756 +#: core/models.py:547 core/models.py:756 core/views/files.py:122 msgid "view group" msgstr "groupe de vue"