Convert _().format() calls to {% trans %} tags in history.html

This commit is contained in:
Andrew Dickinson 2020-04-26 13:21:32 -04:00
parent 9d91eea6c2
commit b62f1c637b

View file

@ -32,23 +32,14 @@
{% macro em_surround(text) %}<em class="font-italic">{{ text }}</em>{% endmacro %} {% macro em_surround(text) %}<em class="font-italic">{{ text }}</em>{% endmacro %}
{% macro bill_property_change(event, localized_property_name, from=True) %} {% 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 value_before=em_surround(event.val_before) %}
{% set value_after=em_surround(event.val_after) %}
{% if from %} {% if from %}
{{ {% trans %}Bill {{ bill_description }}: {{ property_name }} changed from {{ value_before }} to {{ value_after }}{% endtrans %}
_("Bill {bill_description}: {property_name} changed from {value_before} to {value_after}").format(
bill_description=em_surround(event.object_desc),
property_name=localized_property_name,
value_before=em_surround(event.val_before),
value_after=em_surround(event.val_after)
)
}}
{% else %} {% else %}
{{ {% trans %}Bill {{ bill_description }}: {{ property_name }} changed to {{ value_after }}{% endtrans %}
_("Bill {bill_description}: {property_name} changed to {value_after}").format(
bill_description=em_surround(event.object_desc),
property_name=localized_property_name,
value_after=em_surround(event.val_after)
)
}}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@ -97,20 +88,12 @@
{% endmacro %} {% endmacro %}
{% macro owers_changed(event, add) %} {% macro owers_changed(event, add) %}
{% set bill_description=em_surround(event.object_desc) %}
{% 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 %}
_("Bill {bill_description}: added {owers_list_str} to owers list").format(
bill_description=em_surround(event.object_desc),
owers_list_str=event.val_after|localize_list|safe
)
}}
{% else %} {% else %}
{{ {% trans %}Bill {{ bill_description }}: removed {{ owers_list_str }} from owers list{% endtrans %}
_("Bill {bill_description}: removed {owers_list_str} from owers list").format(
bill_description=em_surround(event.object_desc),
owers_list_str=event.val_after|localize_list|safe
)
}}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@ -210,20 +193,14 @@
<div class="history_text"> <div class="history_text">
{% if event.operation_type == OperationType.INSERT %} {% if event.operation_type == OperationType.INSERT %}
{% if event.object_type == "Project" %} {% if event.object_type == "Project" %}
{{ _("Project {project_name} added").format( {% set project_name=em_surround(event.object_desc) %}
project_name=em_surround(event.object_desc) {% trans %}Project {{ project_name }} added{% endtrans %}
)
}}
{% elif event.object_type == "Bill" %} {% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} added").format( {% set bill_description=em_surround(event.object_desc) %}
bill_description=em_surround(event.object_desc) {% trans %}Bill {{ bill_description }} added{% endtrans %}
)
}}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{{ _("Participant {participant_name} added").format( {% set participant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc) {% 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" %}
@ -232,55 +209,39 @@
{% 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" %}
{{ _("Project renamed to {new_project_name}").format( {% set new_project_name=em_surround(event.val_after) %}
new_project_name=em_surround(event.val_after) {% trans %}Project renamed to {{ new_project_name }}{% endtrans %}
)
}}
{% elif event.prop_changed == "contact_email" %} {% elif event.prop_changed == "contact_email" %}
{{ _("Project contact email changed to {new_email}").format( {% set new_email=em_surround(event.val_after) %}
new_email=em_surround(event.val_after) {% 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 %}
{{ _("Participant {participant_name} deactivated").format( {% set participant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc) {% trans %}Participant {{ participant_name }} deactivated{% endtrans %}
)
}}
{% else %} {% else %}
{{ _("Participant {participant_name} reactivated").format( {% set participant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc) {% trans %}Participant {{ participant_name }} reactivated{% endtrans %}
)
}}
{% endif %} {% endif %}
{% elif event.prop_changed == "name" %} {% elif event.prop_changed == "name" %}
{{ _("Participant {participant_name} renamed to {new_name}").format( {% set participant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc), {% set new_name=em_surround(event.val_after) %}
new_name=em_surround(event.val_after) {% trans %}Participant {{ participant_name }} renamed to {{ new_name }}{% endtrans %}
)
}}
{% elif event.prop_changed == "what" %} {% elif event.prop_changed == "what" %}
{{ _("Bill {old_description} renamed to {new_description}").format( {% set old_description=em_surround(event.object_desc) %}
old_description=em_surround(event.object_desc), {% set new_description=em_surround(event.val_after) %}
new_description=em_surround(event.val_after) {% trans %}Bill {{ old_description }} renamed to {{ new_description }}{% endtrans %}
)
}}
{% elif event.prop_changed == "weight" %} {% elif event.prop_changed == "weight" %}
{{ _("Participant {participant_name}: weight changed from {old_weight} to {new_weight}").format( {% set participant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc), {% set old_weight=em_surround(event.val_before) %}
old_weight=em_surround(event.val_before), {% set new_weight=em_surround(event.val_after) %}
new_weight=em_surround(event.val_after) {% 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" %}
{{ _("Bill {bill_description}: external link changed to {new_link}").format( {% set bill_description=em_surround(event.object_desc) %}
bill_description=em_surround(event.object_desc), {% set new_link=event.val_after %}
new_link='<a href="{0}" class="font-italic">{0}</a>'.format(event.val_after|escape)|safe {% 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" %}
@ -292,57 +253,33 @@
{% elif event.prop_changed == "date" %} {% elif event.prop_changed == "date" %}
{{ bill_property_change(event, _("date")) }} {{ bill_property_change(event, _("date")) }}
{% else %} {% else %}
{% if event.object_type == "Project" %} {% if event.object_type == "Bill" %}
{{ _("Project {project_name} modified").format( {% set bill_description=em_surround(event.object_desc) %}
project_name=em_surround(event.object_desc) {% trans %}Bill {{ bill_description }} modfied{% endtrans %}
)
}}
{% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} modfied").format(
bill_description=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{{ _("Participant {particpant_name} modified").format( {% set particpant_name=em_surround(event.object_desc) %}
particpant_name=em_surround(event.object_desc) {% 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 == "Project" %} {% if event.object_type == "Bill" %}
{{ _("Project {project_name} removed").format( {% set bill_description=em_surround(event.object_desc) %}
project_name=em_surround(event.object_desc) {% trans %}Bill {{ bill_description }} removed{% endtrans %}
)
}}
{% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} removed").format(
bill_description=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{{ _("Participant {participant_name} removed").format( {% set particpant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc) {% 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" %}
{{ _("Project {project_name} changed in an unknown way").format( {% set project_name=em_surround(event.object_desc) %}
project_name=em_surround(event.object_desc) {% trans %}Project {{ project_name }} changed in an unknown way{% endtrans %}
)
}}
{% elif event.object_type == "Bill" %} {% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} changed in an unknown way").format( {% set bill_description=em_surround(event.object_desc) %}
bill_description=em_surround(event.object_desc) {% trans %}Bill {{ bill_description }} changed in an unknown way{% endtrans %}
)
}}
{% elif event.object_type == "Person" %} {% elif event.object_type == "Person" %}
{{ _("Participant {participant_name} changed in an unknown way").format( {% set particpant_name=em_surround(event.object_desc) %}
participant_name=em_surround(event.object_desc) {% trans %}Participant {{ participant_name }} changed in an unknown way{% endtrans %}
)
}}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>