fix title of page translations and coherency

This commit is contained in:
2021-08-22 22:24:46 +02:00
parent a0b914380b
commit 668b3e182e
7 changed files with 22 additions and 23 deletions

View File

@@ -1,10 +1,6 @@
{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
{% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
{% block title %}
{{ title|trans }}
{% endblock %}
{% block title %}{%- if 'DRAFT' == accompanyingCourse.step -%}{{ 'New accompanying course'|trans }}{%- else -%}{{ 'Edit Accompanying Course'|trans }}{%- endif -%}{% endblock %}
{% block content %}
<div id="accompanying-course"></div> {# <== insert accompanyingCourse vue component #}

View File

@@ -2,7 +2,7 @@
{% set activeRouteKey = 'chill_person_accompanying_period_list' %}
{% block title %}{{ 'Accompanying period list'|trans }}{% endblock title %}
{% block title %}{{ 'Accompanying period list for person'|trans }}{% endblock title %}
{% block personcontent %}
<div class="person-accompanyingperiods">

View File

@@ -2,12 +2,12 @@
{% set activeRouteKey = 'chill_person_view' %}
{% block title 'household.Household history for %name%'|trans({'name': person|chill_entity_render_string}) %}
{% block title 'household.Household history for person'|trans %}
{% block personcontent %}
<div class="person-household">
<h1>{{ block('title') }}</h1>
<h1>{{ 'household.Household history'|trans }}</h1>
<h2>{{ 'household.Household shared'|trans }}</h2>
{% set memberships = person.getHouseholdParticipationsShareHousehold() %}
@@ -63,7 +63,7 @@
{{ 'household.Household number'|trans({'household_num': p.household.id }) }}
</a>
</p>
<p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %}
<p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %}
</div>
<div>
{% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -72,7 +72,7 @@
{{ 'household.Any simultaneous members'|trans }}
</p>
{% else %}
{{ 'household.Members at same time'|trans }}:
{{ 'household.Members at same time'|trans }}:
{% for p in simultaneous -%}
{{- p.person|chill_entity_render_box({'addLink': true }) -}}
{%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}
@@ -139,10 +139,10 @@
</a>
</p>
<p>
{{ p.position.label|localize_translatable_string }}
{{ p.position.label|localize_translatable_string }}
{% if p.holder %}
<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
{% endif %}
{% endif %}
</div>
<div>
{% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -151,7 +151,7 @@
{{ 'household.Any simultaneous members'|trans }}
</p>
{% else %}
{{ 'household.Members at same time'|trans }}:
{{ 'household.Members at same time'|trans }}:
{% for p in simultaneous -%}
{{- p.person|chill_entity_render_box({'addLink': true }) -}}
{%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}