Fixes to moved up/down messages

- Always use numerals
 - No longer show move up as a negative number
pull/3275/merge
Karl Hobley 2016-11-21 11:00:47 +00:00 zatwierdzone przez Matt Westcott
rodzic 3cb578fa5f
commit fdae00805e
2 zmienionych plików z 9 dodań i 5 usunięć
wagtail/wagtailadmin
templates/wagtailadmin/pages/revisions

Wyświetl plik

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n %}
{% load i18n wagtailadmin_tags %}
{% block titletag %}{% blocktrans with title=page.get_admin_display_title %}Comparing {{ title }}{% endblocktrans %}{% endblock %}
@ -64,14 +64,13 @@
{% if move %}
{% if move > 0 %}
{% blocktrans count counter=move %}
Moved down one place.
Moved down 1 place.
{% plural %}
Moved down {{ counter }} places.
{% endblocktrans %}
{% elif move < 0 %}
{# TODO: How can we make this positive? #}
{% blocktrans count counter=move %}
Moved up one place.
{% blocktrans count counter=move|abs %}
Moved up 1 place.
{% plural %}
Moved up {{ counter }} places.
{% endblocktrans %}

Wyświetl plik

@ -354,3 +354,8 @@ def replace_page_param(query, page_number, page_key='p'):
Replaces ``page_key`` from query string with ``page_number``.
"""
return conditional_escape(replace_page_in_query(query, page_number, page_key))
@register.filter('abs')
def _abs(val):
return abs(val)