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

first (and unique?) round of simplification

Browse source
This commit is contained in:
Glandos 2021-07-11 23:28:57 +02:00
parent 9d7aeb41fc
commit fbc910fdd1
1 changed files with 36 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
ihatemoney/templates/history.html
View file

@ -29,17 +29,13 @@
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
{% macro em_surround(text) %}<em class="font-italic">{{ text }}</em>{% endmacro %} {% macro bill_property_change(event, localized_property_name, before=event.val_before|em_surround, after=event.val_after|em_surround) %}
{% set name=event.object_desc|em_surround %}
{% macro bill_property_change(event, localized_property_name, from=True) %}
{% set bill_description=em_surround(event.object_desc) %}
{% set property_name=localized_property_name %} {% set property_name=localized_property_name %}
{% set value_before=em_surround(event.val_before) %} {% if before %}
{% set value_after=em_surround(event.val_after) %} {% trans %}Bill {{ name }}: {{ property_name }} changed from {{ before }} to {{ after }}{% endtrans %}
{% if from %}
{% trans %}Bill {{ bill_description }}: {{ property_name }} changed from {{ value_before }} to {{ value_after }}{% endtrans %}
{% else %} {% else %}
{% trans %}Bill {{ bill_description }}: {{ property_name }} changed to {{ value_after }}{% endtrans %} {% trans %}Bill {{ name }}: {{ property_name }} changed to {{ after }}{% endtrans %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@ -88,12 +84,12 @@
{% endmacro %} {% endmacro %}
{% macro owers_changed(event, add) %} {% macro owers_changed(event, add) %}
{% set bill_description=em_surround(event.object_desc) %} {% set name=event.object_desc|em_surround %}
{% set owers_list_str=event.val_after|localize_list|safe %} {% set owers_list_str=event.val_after|localize_list|safe %}
{% if add %} {% if add %}
{% trans %}Bill {{ bill_description }}: added {{ owers_list_str }} to owers list{% endtrans %} {% trans %}Bill {{ name }}: added {{ owers_list_str }} to owers list{% endtrans %}
{% else %} {% else %}
{% trans %}Bill {{ bill_description }}: removed {{ owers_list_str }} from owers list{% endtrans %} {% trans %}Bill {{ name }}: removed {{ owers_list_str }} from owers list{% endtrans %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@ -175,16 +171,16 @@
></i> ></i>
</div> </div>
<div class="history_text"> <div class="history_text">
{# Common value setting #}
{% set name=event.object_desc|em_surround %}
{% if event.operation_type == OperationType.INSERT %} {% if event.operation_type == OperationType.INSERT %}
{% if event.object_type == "Project" %} {% if event.object_type == "Project" %}
{% set project_name=em_surround(event.object_desc) %} {% trans %}Project {{ name }} added{% endtrans %}
{% trans %}Project {{ project_name }} added{% endtrans %}
{% elif event.object_type == "Bill" %} {% elif event.object_type == "Bill" %}
{% set bill_description=em_surround(event.object_desc) %} {% trans %}Bill {{ name }} added{% endtrans %}
{% trans %}Bill {{ bill_description }} added{% endtrans %}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{% set participant_name=em_surround(event.object_desc) %} {% trans %}Participant {{ name }} added{% endtrans %}
{% trans %}Participant {{ participant_name }} added{% endtrans %}
{% endif %} {% endif %}
{% elif event.operation_type == OperationType.UPDATE %} {% elif event.operation_type == OperationType.UPDATE %}
{% if event.object_type == "Project" %} {% if event.object_type == "Project" %}
@ -193,39 +189,32 @@
{% elif event.prop_changed == "logging_preference" %} {% elif event.prop_changed == "logging_preference" %}
{{ change_to_logging_preference(event) }} {{ change_to_logging_preference(event) }}
{% elif event.prop_changed == "name" %} {% elif event.prop_changed == "name" %}
{% set new_project_name=em_surround(event.val_after) %} {% set new_project_name=event.val_after|em_surround %}
{% trans %}Project renamed to {{ new_project_name }}{% endtrans %} {% trans %}Project renamed to {{ new_project_name }}{% endtrans %}
{% elif event.prop_changed == "contact_email" %} {% elif event.prop_changed == "contact_email" %}
{% set new_email=em_surround(event.val_after) %} {% set new_email=event.val_after|em_surround %}
{% trans %}Project contact email changed to {{ new_email }}{% endtrans %} {% trans %}Project contact email changed to {{ new_email }}{% endtrans %}
{% else %} {% else %}
{{ _("Project settings modified") }} {{ _("Project settings modified") }}
{% endif %} {% endif %}
{% elif event.prop_changed == "activated" %} {% elif event.prop_changed == "activated" %}
{% if event.val_after == False %} {% if event.val_after == False %}
{% set participant_name=em_surround(event.object_desc) %} {% trans %}Participant {{ name }} deactivated{% endtrans %}
{% trans %}Participant {{ participant_name }} deactivated{% endtrans %}
{% else %} {% else %}
{% set participant_name=em_surround(event.object_desc) %} {% trans %}Participant {{ name }} reactivated{% endtrans %}
{% trans %}Participant {{ participant_name }} reactivated{% endtrans %}
{% endif %} {% endif %}
{% elif event.prop_changed == "name" %} {% elif event.prop_changed == "name" %}
{% set participant_name=em_surround(event.object_desc) %} {% set new_name=event.val_after|em_surround %}
{% set new_name=em_surround(event.val_after) %} {% trans %}Participant {{ name }} renamed to {{ new_name }}{% endtrans %}
{% trans %}Participant {{ participant_name }} renamed to {{ new_name }}{% endtrans %}
{% elif event.prop_changed == "what" %} {% elif event.prop_changed == "what" %}
{% set old_description=em_surround(event.object_desc) %} {% set new_description=event.val_after|em_surround %}
{% set new_description=em_surround(event.val_after) %} {% trans %}Bill {{ name }} renamed to {{ new_description }}{% endtrans %}
{% trans %}Bill {{ old_description }} renamed to {{ new_description }}{% endtrans %}
{% elif event.prop_changed == "weight" %} {% elif event.prop_changed == "weight" %}
{% set participant_name=em_surround(event.object_desc) %} {% set old_weight=event.val_before|em_surround %}
{% set old_weight=em_surround(event.val_before) %} {% set new_weight=event.val_after|em_surround %}
{% set new_weight=em_surround(event.val_after) %} {% trans %}Participant {{ name }}: weight changed from {{ old_weight }} to {{ new_weight }}{% endtrans %}
{% trans %}Participant {{ participant_name }}: weight changed from {{ old_weight }} to {{ new_weight }}{% endtrans %}
{% elif event.prop_changed == "external_link" %} {% elif event.prop_changed == "external_link" %}
{% set bill_description=em_surround(event.object_desc) %} {{ bill_property_change(event, _("External link"), None, "<a href='{link}' >{link}</a>".format(link=event.val_after | escape) | safe | em_surround) }}
{% set new_link=event.val_after %}
{% trans %}Bill {{ bill_description }}: external link changed to <a href="{{ new_link }}" class="font-italic">{{ new_link }}</a>{% endtrans %}
{% elif event.prop_changed == "owers_added" %} {% elif event.prop_changed == "owers_added" %}
{{ owers_changed(event, True)}} {{ owers_changed(event, True)}}
{% elif event.prop_changed == "owers_removed" %} {% elif event.prop_changed == "owers_removed" %}
@ -235,39 +224,32 @@
{% elif event.prop_changed == "amount" %} {% elif event.prop_changed == "amount" %}
{{ bill_property_change(event, _("amount")) }} {{ bill_property_change(event, _("amount")) }}
{% elif event.prop_changed == "date" %} {% elif event.prop_changed == "date" %}
{{ simple_property_change(event, _("Date")) }} {{ bill_property_change(event, _("Date")) }}
{% elif event.prop_changed == "original_currency" %} {% elif event.prop_changed == "original_currency" %}
{{ simple_property_change(event, _("Currency")) }} {{ bill_property_change(event, _("Currency")) }}
{% elif event.prop_changed == "converted_amount" %} {% elif event.prop_changed == "converted_amount" %}
{{ simple_property_change(event, _("Amount in %(currency)s", currency=g.project.default_currency)) }} {{ bill_property_change(event, _("Amount in %(currency)s", currency=g.project.default_currency)) }}
{% else %} {% else %}
{% if event.object_type == "Bill" %} {% if event.object_type == "Bill" %}
{% set bill_description=em_surround(event.object_desc) %} {% trans %}Bill {{ name }} modified{% endtrans %}
{% trans %}Bill {{ bill_description }} modfied{% endtrans %}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{% set particpant_name=em_surround(event.object_desc) %} {% trans %}Participant {{ name }} modified{% endtrans %}
{% trans %}Participant {{ particpant_name }} modfied{% endtrans %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% elif event.operation_type == OperationType.DELETE %} {% elif event.operation_type == OperationType.DELETE %}
{% if event.object_type == "Bill" %} {% if event.object_type == "Bill" %}
{% set bill_description=em_surround(event.object_desc) %} {% trans %}Bill {{ name }} removed{% endtrans %}
{% trans %}Bill {{ bill_description }} removed{% endtrans %}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{% set particpant_name=em_surround(event.object_desc) %} {% trans %}Participant {{ name }} removed{% endtrans %}
{% trans %}Participant {{ particpant_name }} removed{% endtrans %}
{% endif %} {% endif %}
{% else %} {% else %}
{# Should be unreachable #} {# Should be unreachable #}
{% if event.object_type == "Project" %} {% if event.object_type == "Project" %}
{% set project_name=em_surround(event.object_desc) %} {% trans %}Project {{ name }} changed in an unknown way{% endtrans %}
{% trans %}Project {{ project_name }} changed in an unknown way{% endtrans %}
{% elif event.object_type == "Bill" %} {% elif event.object_type == "Bill" %}
{% set bill_description=em_surround(event.object_desc) %} {% trans %}Bill {{ name }} changed in an unknown way{% endtrans %}
{% trans %}Bill {{ bill_description }} changed in an unknown way{% endtrans %}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{% set particpant_name=em_surround(event.object_desc) %} {% trans %}Participant {{ name }} changed in an unknown way{% endtrans %}
{% trans %}Participant {{ participant_name }} changed in an unknown way{% endtrans %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>