Kaydet (Commit) a8705cec authored tarafından Adrian Holovaty's avatar Adrian Holovaty

Fixed #2524 -- Added i18n hooks in create_update generic views. Thanks, mir@noris.de

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
üst e5bf5746
...@@ -6,6 +6,7 @@ from django.contrib.auth.views import redirect_to_login ...@@ -6,6 +6,7 @@ from django.contrib.auth.views import redirect_to_login
from django.template import RequestContext from django.template import RequestContext
from django.http import Http404, HttpResponse, HttpResponseRedirect from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
from django.utils.translation import gettext
def create_object(request, model, template_name=None, def create_object(request, model, template_name=None,
template_loader=loader, extra_context=None, post_save_redirect=None, template_loader=loader, extra_context=None, post_save_redirect=None,
...@@ -39,7 +40,7 @@ def create_object(request, model, template_name=None, ...@@ -39,7 +40,7 @@ def create_object(request, model, template_name=None,
new_object = manipulator.save(new_data) new_object = manipulator.save(new_data)
if request.user.is_authenticated(): if request.user.is_authenticated():
request.user.message_set.create(message="The %s was created successfully." % model._meta.verbose_name) request.user.message_set.create(message=gettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name})
# Redirect to the new object: first by trying post_save_redirect, # Redirect to the new object: first by trying post_save_redirect,
# then by obj.get_absolute_url; fail if neither works. # then by obj.get_absolute_url; fail if neither works.
...@@ -113,7 +114,7 @@ def update_object(request, model, object_id=None, slug=None, ...@@ -113,7 +114,7 @@ def update_object(request, model, object_id=None, slug=None,
object = manipulator.save(new_data) object = manipulator.save(new_data)
if request.user.is_authenticated(): if request.user.is_authenticated():
request.user.message_set.create(message="The %s was updated successfully." % model._meta.verbose_name) request.user.message_set.create(message=gettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name})
# Do a post-after-redirect so that reload works, etc. # Do a post-after-redirect so that reload works, etc.
if post_save_redirect: if post_save_redirect:
...@@ -180,7 +181,7 @@ def delete_object(request, model, post_delete_redirect, ...@@ -180,7 +181,7 @@ def delete_object(request, model, post_delete_redirect,
if request.method == 'POST': if request.method == 'POST':
object.delete() object.delete()
if request.user.is_authenticated(): if request.user.is_authenticated():
request.user.message_set.create(message="The %s was deleted." % model._meta.verbose_name) request.user.message_set.create(message=gettext("The %(verbose_name)s was deleted.") % {"verbose_name": model._meta.verbose_name})
return HttpResponseRedirect(post_delete_redirect) return HttpResponseRedirect(post_delete_redirect)
else: else:
if not template_name: if not template_name:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment