diff --git a/djadmin2/templatetags/admin2_tags.py b/djadmin2/templatetags/admin2_tags.py index 833cef0..11b0e18 100644 --- a/djadmin2/templatetags/admin2_tags.py +++ b/djadmin2/templatetags/admin2_tags.py @@ -45,6 +45,14 @@ def model_verbose_name_plural(obj): return utils.model_verbose_name_plural(obj) +@register.filter +def verbose_name_for(verbose_names, app_label): + """ + Returns the verbose name of an app. + """ + return verbose_names.get(app_label, None) + + @register.filter def model_attr_verbose_name(obj, attr): """ diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/actions/delete_selected_confirmation.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/actions/delete_selected_confirmation.html index b36c05d..8a36b38 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/actions/delete_selected_confirmation.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/actions/delete_selected_confirmation.html @@ -11,7 +11,7 @@ /
  • - {{ app_label|title }} + {% firstof app_verbose_name app_label|title %} /
  • diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/app_index.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/app_index.html index 6a0e6d8..b10d564 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/app_index.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/app_index.html @@ -6,7 +6,11 @@ {% trans "Home" %} /
  • -
  • {{ app_label|title }}
  • +
  • + {% with app_verbose_names|verbose_name_for:app_label as verbose_name %} + {% firstof verbose_name app_label|title %} + {% endwith %} +
  • {% endblock breadcrumbs %} {% block page_title %}{% blocktrans with app_label=app_label|title %}{{ app_label }} administration{% endblocktrans %}{% endblock page_title %} diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/app_model_list.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/app_model_list.html index cb864d4..4de9699 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/app_model_list.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/app_model_list.html @@ -5,7 +5,9 @@ - {{ app_label|title }} + {% with app_verbose_names|verbose_name_for:app_label as verbose_name %} + {% firstof verbose_name app_label|title %} + {% endwith %} diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_confirm_delete.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_confirm_delete.html index a5f1c67..21de593 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_confirm_delete.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_confirm_delete.html @@ -11,7 +11,7 @@ /
  • - {{ app_label|title }} + {% firstof app_verbose_name app_label|title %} /
  • diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_detail.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_detail.html index 5868bc4..609be60 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_detail.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_detail.html @@ -12,7 +12,7 @@ /
  • - {{ app_label|title }} + {% firstof app_verbose_name app_label|title %} /
  • diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html index e6534b2..91bebef 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html @@ -11,7 +11,7 @@ /
  • - {{ app_label|title }} + {% firstof app_verbose_name app_label|title %} /
  • diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_list.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_list.html index c425d4a..74236fa 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_list.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_list.html @@ -15,7 +15,7 @@ /
  • - {{ app_label|title }} + {% firstof app_verbose_name app_label|title %} /
  • {{ model_name_pluralized|title }}
  • diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html index 3e303dd..8d25010 100644 --- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html +++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html @@ -20,7 +20,7 @@ /
  • - {{ app_label|title }} + {% firstof app_verbose_name app_label|title %} /