summaryrefslogtreecommitdiff
path: root/docs/generic_views.txt
diff options
context:
space:
mode:
authorGeorg Bauer <gb@hugo.westfalen.de>2005-10-11 20:24:45 +0000
committerGeorg Bauer <gb@hugo.westfalen.de>2005-10-11 20:24:45 +0000
commitd442731eb2af671d93550426cf061713a50468d2 (patch)
tree6d2242897331a0037764a9b44349b1922e6772d0 /docs/generic_views.txt
parentd79cfec906daf449c0fa22bb9a8d3dd205567fde (diff)
i18n: merged r815:r843 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/generic_views.txt')
-rw-r--r--docs/generic_views.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/generic_views.txt b/docs/generic_views.txt
index 62e7c14e2b..1c0de07a7a 100644
--- a/docs/generic_views.txt
+++ b/docs/generic_views.txt
@@ -115,7 +115,7 @@ The date-based generic functions are:
Yearly archive. Requires that the ``year`` argument be present in the URL
pattern.
- Uses the template ``app_label/module_name__archive_year`` by default.
+ Uses the template ``app_label/module_name_archive_year`` by default.
Has the following template context:
@@ -134,7 +134,7 @@ The date-based generic functions are:
default, which is a three-letter month abbreviation. To change it to use
numbers, use ``"%m"``.
- Uses the template ``app_label/module_name__archive_month`` by default.
+ Uses the template ``app_label/module_name_archive_month`` by default.
Has the following template context:
@@ -151,7 +151,7 @@ The date-based generic functions are:
also pass ``day_format``, which defaults to ``"%d"`` (day of the month as a
decimal number, 1-31).
- Uses the template ``app_label/module_name__archive_day`` by default.
+ Uses the template ``app_label/module_name_archive_day`` by default.
Has the following template context:
@@ -246,6 +246,8 @@ Individual views are:
The previous page
``pages``
Number of pages total
+ ``hits``
+ Total number of objects
``object_detail``
Object detail page. This works like and takes the same arguments as
@@ -272,7 +274,7 @@ The create/update/delete views are:
be interpolated against the object's field attributes. For example, you
could use ``post_save_redirect="/polls/%(slug)s/"``.
- Uses the template ``app_label/module_name__form`` by default. This is the
+ Uses the template ``app_label/module_name_form`` by default. This is the
same template as the ``update_object`` view below. Your template can tell
the different by the presence or absence of ``{{ object }}`` in the
context.
@@ -294,7 +296,7 @@ The create/update/delete views are:
``list_detail.object_detail`` does (see above), and the same
``post_save_redirect`` as ``create_object`` does.
- Uses the template ``app_label/module_name__form`` by default.
+ Uses the template ``app_label/module_name_form`` by default.
Has the following template context: