diff options
| author | Marc Garcia <garcia.marc@gmail.com> | 2009-08-16 21:45:09 +0000 |
|---|---|---|
| committer | Marc Garcia <garcia.marc@gmail.com> | 2009-08-16 21:45:09 +0000 |
| commit | 18e151bc3f8a85f2766d64262902a9fcad44d937 (patch) | |
| tree | e8c8c58ab590afb30356bea2a445da89ca304325 /django | |
| parent | 1d5aad87f4cd4ccffd24fffe25d6fa6be0bfbdf4 (diff) | |
| download | django-soc2009/i18n-improvements.tar.gz | |
[soc2009/i18n] merged up to trunk r11463archive/soc2009/i18n-improvementssoc2009/i18n-improvements
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/i18n-improvements@11464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/delete_selected_confirmation.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 31a28ccf0b..3144a22a2a 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -482,7 +482,7 @@ class ModelAdmin(BaseModelAdmin): def get_action(self, action): """ - Return a given action from a parameter, which can either be a calable, + Return a given action from a parameter, which can either be a callable, or the name of a method on the ModelAdmin. Return is a tuple of (callable, name, description). """ diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index a6258b94c0..5550b73e2e 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -19,7 +19,7 @@ {% endfor %} </ul> {% else %} - <p>{% blocktrans %}Are you sure you want to delete the selected {{ object_name }} objects? All of the following objects and it's related items will be deleted:{% endblocktrans %}</p> + <p>{% blocktrans %}Are you sure you want to delete the selected {{ object_name }} objects? All of the following objects and their related items will be deleted:{% endblocktrans %}</p> {% for deleteable_object in deletable_objects %} <ul>{{ deleteable_object|unordered_list }}</ul> {% endfor %} @@ -34,4 +34,4 @@ </div> </form> {% endif %} -{% endblock %}
\ No newline at end of file +{% endblock %} |