diff options
| -rw-r--r-- | django/contrib/admin/templates/admin/delete_confirmation.html | 31 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/delete_selected_confirmation.html | 31 |
2 files changed, 28 insertions, 34 deletions
diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 9d5172ad6a..6487280d3a 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -14,23 +14,20 @@ {% endblock %} {% block content %} -{% if perms_lacking or protected %} - {% if perms_lacking %} - <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p> - <ul> - {% for obj in perms_lacking %} - <li>{{ obj }}</li> - {% endfor %} - </ul> - {% endif %} - {% if protected %} - <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}</p> - <ul> - {% for obj in protected %} - <li>{{ obj }}</li> - {% endfor %} - </ul> - {% endif %} +{% if perms_lacking %} + <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p> + <ul> + {% for obj in perms_lacking %} + <li>{{ obj }}</li> + {% endfor %} + </ul> +{% elif protected %} + <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}</p> + <ul> + {% for obj in protected %} + <li>{{ obj }}</li> + {% endfor %} + </ul> {% else %} <p>{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p> <ul>{{ deleted_objects|unordered_list }}</ul> diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index 79ea977d26..731c66061d 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -13,23 +13,20 @@ {% endblock %} {% block content %} -{% if perms_lacking or protected %} - {% if perms_lacking %} - <p>{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p> - <ul> - {% for obj in perms_lacking %} - <li>{{ obj }}</li> - {% endfor %} - </ul> - {% endif %} - {% if protected %} - <p>{% blocktrans %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktrans %}</p> - <ul> - {% for obj in protected %} - <li>{{ obj }}</li> - {% endfor %} - </ul> - {% endif %} +{% if perms_lacking %} + <p>{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p> + <ul> + {% for obj in perms_lacking %} + <li>{{ obj }}</li> + {% endfor %} + </ul> +{% elif protected %} + <p>{% blocktrans %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktrans %}</p> + <ul> + {% for obj in protected %} + <li>{{ obj }}</li> + {% endfor %} + </ul> {% else %} <p>{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}</p> {% for deletable_object in deletable_objects %} |