almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix capitalization, spelling, and link formatting

Browse source
This commit is contained in:
Andrew Dickinson 2020-04-25 21:08:40 -04:00
parent ead1abef53
commit 62785f1fbc
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ihatemoney/templates/history.html
View file

@ -101,7 +101,7 @@
{% macro owers_changed(event, add) %} {% macro owers_changed(event, add) %}
{% if add %} {% if add %}
{{ {{
_("{object_type} {object_description}: Added {owers_list_str} to owers list").format( _("{object_type} {object_description}: added {owers_list_str} to owers list").format(
object_type=event.object_type, object_type=event.object_type,
object_description=em_surround(event.object_desc), object_description=em_surround(event.object_desc),
owers_list_str=event.val_after|localize_list|safe owers_list_str=event.val_after|localize_list|safe
@ -109,7 +109,7 @@
}} }}
{% else %} {% else %}
{{ {{
_("{object_type} {object_description}: Removed {owers_list_str} from owers list").format( _("{object_type} {object_description}: removed {owers_list_str} from owers list").format(
object_type=event.object_type, object_type=event.object_type,
object_description=em_surround(event.object_desc), object_description=em_surround(event.object_desc),
owers_list_str=event.val_after|localize_list|safe owers_list_str=event.val_after|localize_list|safe
@ -259,12 +259,12 @@
) )
}} }}
{% elif event.prop_changed == "weight" %} {% elif event.prop_changed == "weight" %}
{{ simple_property_change(event, _("Weight")) }} {{ simple_property_change(event, _("weight")) }}
{% elif event.prop_changed == "external_link" %} {% elif event.prop_changed == "external_link" %}
{{ _("{object_type} {object_description}: External link changed to {new_link}").format( {{ _("{object_type} {object_description}: external link changed to {new_link}").format(
object_type=event.object_type, object_type=event.object_type,
object_description=em_surround(event.object_desc), object_description=em_surround(event.object_desc),
new_link='<a href="{0}" class="font-italic">{0}</a>'.format(event.val_after) new_link='<a href="{0}" class="font-italic">{0}</a>'.format(event.val_after|escape)|safe
) )
}} }}
{% elif event.prop_changed == "owers_added" %} {% elif event.prop_changed == "owers_added" %}
@ -272,11 +272,11 @@
{% elif event.prop_changed == "owers_removed" %} {% elif event.prop_changed == "owers_removed" %}
{{ owers_changed(event, False)}} {{ owers_changed(event, False)}}
{% elif event.prop_changed == "payer" %} {% elif event.prop_changed == "payer" %}
{{ simple_property_change(event, _("Payer"))}} {{ simple_property_change(event, _("payer"))}}
{% elif event.prop_changed == "amount" %} {% elif event.prop_changed == "amount" %}
{{ simple_property_change(event, _("Amount")) }} {{ simple_property_change(event, _("amount")) }}
{% elif event.prop_changed == "date" %} {% elif event.prop_changed == "date" %}
{{ simple_property_change(event, _("Date")) }} {{ simple_property_change(event, _("date")) }}
{% else %} {% else %}
{{ _("{object_type} {object_description} modified").format( {{ _("{object_type} {object_description} modified").format(
object_type=event.object_type, object_type=event.object_type,
@ -292,7 +292,7 @@
}} }}
{% else %} {% else %}
{# Should be unreachable #} {# Should be unreachable #}
{{ _("{object_type} {object_description} changed in an unkown way").format( {{ _("{object_type} {object_description} changed in an unknown way").format(
object_type=event.object_type, object_type=event.object_type,
object_description=em_surround(event.object_desc) object_description=em_surround(event.object_desc)
) )

10
ihatemoney/tests/tests.py
View file

@ -2618,7 +2618,7 @@ class HistoryTestCase(IhatemoneyTestCase):
) )
self.assertRegex( self.assertRegex(
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
r"Bill %s:\s* Amount changed\s* from %s\s* to %s" r"Bill %s:\s* amount changed\s* from %s\s* to %s"
% ( % (
em_surround("25.0 for fromage à raclette", regex_escape=True), em_surround("25.0 for fromage à raclette", regex_escape=True),
em_surround("25.0", regex_escape=True), em_surround("25.0", regex_escape=True),
@ -2634,7 +2634,7 @@ class HistoryTestCase(IhatemoneyTestCase):
resp.data.decode("utf-8").index( resp.data.decode("utf-8").index(
f"Bill {em_surround('25.0 for fromage à raclette')} renamed to" f"Bill {em_surround('25.0 for fromage à raclette')} renamed to"
), ),
resp.data.decode("utf-8").index("Amount changed"), resp.data.decode("utf-8").index("amount changed"),
) )
# delete the bill # delete the bill
@ -2660,7 +2660,7 @@ class HistoryTestCase(IhatemoneyTestCase):
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertRegex( self.assertRegex(
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
r"Participant %s:\s* Weight changed\s* from %s\s* to %s" r"Participant %s:\s* weight changed\s* from %s\s* to %s"
% ( % (
em_surround("alexis", regex_escape=True), em_surround("alexis", regex_escape=True),
em_surround("1.0", regex_escape=True), em_surround("1.0", regex_escape=True),
@ -2676,7 +2676,7 @@ class HistoryTestCase(IhatemoneyTestCase):
resp.data.decode("utf-8").index( resp.data.decode("utf-8").index(
f"Participant {em_surround('alexis')} renamed" f"Participant {em_surround('alexis')} renamed"
), ),
resp.data.decode("utf-8").index("Weight changed"), resp.data.decode("utf-8").index("weight changed"),
) )
# delete user using POST method # delete user using POST method
@ -2739,7 +2739,7 @@ class HistoryTestCase(IhatemoneyTestCase):
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertRegex( self.assertRegex(
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
r"Bill {}:\s* Amount changed\s* from {}\s* to {}".format( r"Bill {}:\s* amount changed\s* from {}\s* to {}".format(
em_surround("25.0 for Bill 1", regex_escape=True), em_surround("25.0 for Bill 1", regex_escape=True),
em_surround("25.0", regex_escape=True), em_surround("25.0", regex_escape=True),
em_surround("88.0", regex_escape=True), em_surround("88.0", regex_escape=True),