Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Refactoring translation

Browse Source
This commit is contained in:
Marc Ducobu
2014-11-19 09:43:53 +01:00
parent 4c2a3c3624
commit 87b4cb65e4
18 changed files with 209 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/views/Form/go_to_form.html.twig
View File

@@ -1,6 +1,6 @@
<div class="form_control">
<div class="controls">
<div class="small warning btn icon-right entypo icon-pencil"><a href="{{ path(form_path_key, form_path_args) }}">{{ 'views.common.edit'|trans }}</a></div>
<div class="small warning btn icon-right entypo icon-pencil"><a href="{{ path(form_path_key, form_path_args) }}">{{ 'Edit'|trans }}</a></div>
</div>
</div>

10
Resources/views/History/form.html.twig
View File

@@ -9,23 +9,23 @@
{{ form_start(form) }}
{{ 'views.Person.close.last_opening_since'|trans(
{{ 'Last opening since %last_opening%'|trans(
{ '%last_opening%' : history.dateOpening|date(date_format) }) }}
{% if form.dateClosing is defined %}
{{ form_row(form.dateClosing, {'label' : 'views.Person.close.date_of_closing'} ) }}
{{ form_row(form.dateClosing, {'label' : 'Closing date'} ) }}
{% endif %}
{% if form.closingMotive is defined %}
{{ form_row(form.closingMotive, {'label' : 'views.Person.close.motive_of_closing'} ) }}
{{ form_row(form.closingMotive, {'label' : 'Closing motive'} ) }}
{% endif %}
{{ form_row(form.memo, {'label' : 'views.Person.close.texto' } ) }}
{{ form_row(form.memo, {'label' : 'Memo' } ) }}
{{ form_rest(form) }}
<div class="medium btn danger icon-right entypo icon-lock">
<button type="submit">{{ 'views.Person.close.action'|trans }}</button>
<button type="submit">{{ 'Close person history'|trans }}</button>
</div>
{{ form_end(form) }}

16
Resources/views/History/list.html.twig
View File

@@ -2,14 +2,14 @@
{% set activeRouteKey = 'chill_person_history_list' %}
{% block title %}{{ 'views.Person.hlist.title'|trans({ '%name%' : person.__toString}) }}{% endblock title %}
{% block title %}{{ 'Person history - %name%'|trans({ '%name%' : person.__toString}) }}{% endblock title %}
{% block personcontent %}
<table class="rounded">
<thead>
<tr>
<th>{{ 'views.Person.hlist.dateOpening_title'|trans }}</th>
<th>{{ 'views.Person.hlist.dateClosing_title'|trans }}</th>
<th>{{ 'Opening date'|trans }}</th>
<th>{{ 'Closing date'|trans }}</th>
<th>&nbsp;</th>
</tr>
@@ -21,7 +21,7 @@
<td>{{ history.dateOpening|date(date_format) }}</td>
<td>{% spaceless %}
{% if history.isOpen %}
{{ 'views.Person.hlist.still_open'|trans }}
{{ 'Still open'|trans }}
{% else %}
{{ history.dateClosing|date(date_format) }}
@@ -30,7 +30,7 @@
{% endspaceless %}</td>
<td>
<div class="small warning btn icon-right entypo icon-pencil">
<a href="{{ path('chill_person_history_update', {'person_id' : person.id, 'history_id' : history.id } ) }}">{{ 'views.Person.hlist.edit'|trans }}</a>
<a href="{{ path('chill_person_history_update', {'person_id' : person.id, 'history_id' : history.id } ) }}">{{ 'Edit'|trans }}</a>
</div>
</td>
</tr>
@@ -50,7 +50,7 @@
<div class="form_control">
<div class="btn small warning icon-right entypo icon-plus">
<a href="{{ path ('chill_person_history_create', {'person_id' : person.id } ) }}">
{{ 'views.Person.hlist.create'|trans }}
{{ 'Create history'|trans }}
</a>
</div>
@@ -64,11 +64,11 @@
{% spaceless %}
{% if person.isOpen == true %}
<a href="{{ path('chill_person_history_close', {'person_id' : person.id}) }}">
{{'views.Person.hlist.close'|trans }}
{{'Close history'|trans }}
</a>
{% else %}
<a href="{{ path('chill_person_history_open', {'person_id' : person.id} ) }}">
{{'views.Person.hlist.open'|trans }}
{{'Open history'|trans }}
</a>
{% endif %}
{% endspaceless %}

12
Resources/views/Person/create.html.twig
View File

@@ -16,28 +16,28 @@
#}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block title %}{{ 'views.Person.creation.title'|trans }}{% endblock title %}
{% block title %}{{ 'Add a person'|trans }}{% endblock title %}
{% block content %}
<div id="person_wrapper">
<div id="person_details">
{{ form_start(form) }}
<h1>{{ 'views.Person.creation.open'|trans }}</h1>
<h1>{{ 'Add a person'|trans }}</h1>
{{ form_row(form.firstName, { 'label' : 'First name'|trans }) }}
{{ form_row(form.lastName, { 'label' : 'Last name'|trans }) }}
{{ form_row(form.dateOfBirth, { 'label' : 'views.Person.view.dateOfBirth'|trans }) }}
{{ form_row(form.dateOfBirth, { 'label' : 'Date of birth'|trans }) }}
{{ form_row(form.genre, { 'label' : 'views.Person.view.gender'|trans }) }}
{{ form_row(form.genre, { 'label' : 'Gender'|trans }) }}
{{ form_row(form.creation_date, { 'label' : 'views.Person.review.creation_date'|trans }) }}
{{ form_row(form.creation_date, { 'label' : 'Creation date'|trans }) }}
{{ form_rest(form) }}
<button class="sc-button green" type="submit"><i class="fa fa-plus"></i> {{ 'views.Person.creation.add'|trans }}</button>
<button class="sc-button green" type="submit"><i class="fa fa-plus"></i> {{ 'Add the person'|trans }}</button>
{{ form_end(form) }}
</div>

24
Resources/views/Person/create_review.html.twig
View File

@@ -16,7 +16,7 @@
#}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block title %}{{ 'views.Person.review.title'|trans }}{% endblock title %}
{% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
{% block css %}
@@ -35,9 +35,9 @@
<table class="rounded stripped" style="width=100%">
<thead>
<tr>
<th>{{ 'views.Person.review.altName'|trans }}</th>
<th>{{ 'views.Person.review.altDateOfBirth'|trans }}</th>
<th>{{ 'views.Person.review.altNationality'|trans }}</th>
<th>{{ 'Name'|trans }}</th>
<th>{{ 'Date of birth'|trans }}</th>
<th>{{ 'Nationality'|trans }}</th>
</tr>
</thead>
<tbody>
@@ -50,7 +50,7 @@
</a>
</td>
<td>{{ person.dateOfBirth|date(date_format) }}</td>
<td>{% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{% else %}{{ 'views.Person.view.without_nationality'|trans }}{% endif %}
<td>{% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{% else %}{{ 'Without nationality'|trans }}{% endif %}
</tr>
{% endfor %}
@@ -62,7 +62,7 @@
<div id="person_details">
{{ form_start(form) }}
<h2>{{ 'views.Person.review.you_will_create_this_person'|trans }}</h2>
<h2>{{ 'You will create this person'|trans }}</h2>
<dl>
<dt>{{ 'First name'|trans }}</dt>
@@ -71,19 +71,19 @@
<dt>{{ 'Last name'|trans }}</dt>
<dd>{{ lastName }}</dd>
<dt>{{ 'views.Person.view.dateOfBirth'|trans }}</dt>
<dd>{{ dateOfBirth|date(date_format)|default( 'person.without_date_of_birth'|trans ) }}</dd>
<dt>{{ 'Date of birth'|trans }}</dt>
<dd>{{ dateOfBirth|date(date_format)|default( 'Unknown date of birth'|trans ) }}</dd>
<dt>{{ 'views.Person.view.gender'|trans }}</dt>
<dd>{{ ('person.gender.' ~ genre)|trans }}</dd>
<dt>{{ 'Gender'|trans }}</dt>
<dd>{{ genre|trans }}</dd>
<dt>{{ 'views.Person.review.creation_date'|trans }}</dt>
<dt>{{ 'Creation date'|trans }}</dt>
<dd>{{ creation_date|date(date_format) }}</dd>
</dl>
{{ form_rest(form) }}
<button class="sc-button green" type="submit"><i class="fa fa-check"></i> {{ 'views.Person.review.confirm_creation'|trans }}</button>
<button class="sc-button green" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
{{ form_end(form) }}
</div>

29
Resources/views/Person/edit.html.twig
View File

@@ -27,41 +27,42 @@
{{ form_start(form) }}
<fieldset>
<legend><h2>{{ 'views.Person.view.general'|trans }}</h2></legend>
<legend><h2>{{ 'General information'|trans }}</h2></legend>
{{ form_row(form.firstName, {'label' : 'First name'}) }}
{{ form_row(form.lastName, {'label' : 'Last name'}) }}
{{ form_row(form.genre, {'label' : 'views.Person.view.gender'}) }}
{{ form_row(form.genre, {'label' : 'Gender'}) }}
</fieldset>
<fieldset>
<legend><h2>{{ 'views.Person.view.birth'|trans }}</h2></legend>
{{ form_row(form.dateOfBirth, {'label': 'views.Person.view.dateOfBirth'} ) }}
{{ form_row(form.placeOfBirth, { 'label' : 'views.Person.view.placeOfBirth'} ) }}
{{ form_row(form.countryOfBirth, { 'label' : 'views.Person.view.contry_of_birth' } ) }}
<legend><h2>{{ 'Birth information'|trans }}</h2></legend>
{{ form_row(form.dateOfBirth, {'label': 'Date of birth'} ) }}
{{ form_row(form.placeOfBirth, { 'label' : 'Place of birth'} ) }}
{{ form_row(form.countryOfBirth, { 'label' : 'Country of birth' } ) }}
</fieldset>
<fieldset>
<legend><h2>{{ 'views.Person.view.administrative'|trans }}</h2></legend>
{{ form_row(form.nationality, { 'label' : 'views.Person.view.nationality'|trans} ) }}
<legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
{{ form_row(form.nationality, { 'label' : 'Nationality'|trans} ) }}
</fieldset>
<fieldset>
<legend><h2>{{ 'views.Person.view.contact'|trans }}</h2></legend>
{{ form_row(form.email, {'label': 'views.Person.view.email'}) }}
<legend><h2>{{ 'Contact information'|trans }}</h2></legend>
{{ form_row(form.email, {'label': 'Email'}) }}
{{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
</fieldset>
{{ form_row(form.memo, {'label' : 'views.Person.view.memo'} ) }}
{{ form_row(form.memo, {'label' : 'Memo'} ) }}
{{ form_rest(form) }}
<div class="grid-12 centered sticky-form-buttons">
<a href="{{ path('chill_person_view', {'person_id' : person.id}) }}" class="sc-button grey">
<i class="fa fa-arrow-left"></i>
{{ 'views.Person.edit.cancel'|trans }}
{{ 'Return'|trans }}
</a>
<button class="sc-button green" type="submit"><i class="fa fa-save"></i> {{ 'views.Person.edit.submit'|trans }}</button>
<button class="sc-button red" type="reset"><i class="fa fa-eraser"></i> {{ 'views.Person.edit.reset'|trans }}</button>
<button class="sc-button green" type="submit"><i class="fa fa-save"></i> {{ 'Submit'|trans }}</button>
<button class="sc-button red" type="reset"><i class="fa fa-eraser"></i> {{ 'Reset'|trans }}</button>
</div>
{{ form_end(form) }}

8
Resources/views/Person/list.html.twig
View File

@@ -22,8 +22,8 @@
<thead>
<tr>
<th>{% trans %}Name{% endtrans %}</th>
<th>{% trans %}person.dateOfBirth{% endtrans %}</th>
<th>{% trans %}person.nationality{% endtrans %}</th>
<th>{% trans %}Date of birth{% endtrans %}</th>
<th>{% trans %}Nationality{% endtrans %}</th>
</tr>
</thead>
<tbody>
@@ -40,13 +40,13 @@
</a>
</td>
<td>
<span class="personDateOfBirth">{{person.dateOfBirth.format(date_format)|default( 'person.without_date_of_birth'|trans )}}</span>
<span class="personDateOfBirth">{{person.dateOfBirth.format(date_format)|default( 'Unknown date of birth'|trans )}}</span>
</td>
<td>
{% if person.nationality is not null %}
<span class="personNationality">{{person.nationality.label}}</span>
{% else %}
{{ 'views.Person.list.without_nationality'|trans }}
{{ 'Without nationality'|trans }}
{% endif %}
</td>
</tr>

28
Resources/views/Person/view.html.twig
View File

@@ -39,7 +39,7 @@ This view should receive those arguments:
{{ include(edit_tmp_name, edit_tmp_args) }}
<figure>
<h2>{{ 'views.Person.view.general'|trans }}</h2>
<h2>{{ 'General information'|trans }}</h2>
<dl>
<dt class="inline">{{ 'First name'|trans }}</dt>
@@ -48,28 +48,28 @@ This view should receive those arguments:
<dt class="inline">{{ 'Last name'|trans }}</dt>
<dd>{{ person.lastName }}</dd>
<dt class="inline">{{ 'views.Person.view.gender'|trans }}</dt>
<dd>{{ ( 'person.gender.' ~ person.genre|default('undefined'))|trans }}</dd>
<dt class="inline">{{ 'Gender'|trans }}</dt>
<dd>{{ ( person.genre|default('Not given'))|trans }}</dd>
</dl>
</figure>
<figure>
<h2>{{ 'views.Person.view.birth'|trans }}</h2>
<h2>{{ 'Birth information'|trans }}</h2>
<dl>
<dt class="inline">{{ 'views.Person.view.dateOfBirth'|trans }}</dt>
<dt class="inline">{{ 'Date of birth'|trans }}</dt>
<dd>{{ person.dateOfBirth.format(date_format)
|default( 'person.without_date_of_birth'|trans ) }}</dd>
|default( 'Unknown date of birth'|trans ) }}</dd>
<dt class="inline">{{ 'views.Person.view.placeOfBirth'|trans }}</dt>
<dt class="inline">{{ 'Place of birth'|trans }}</dt>
<dd>{{ person.placeOfBirth }}</dd>
<dd>{% spaceless %}
{% if person.countryOfBirth is not null %}
{{ person.countryOfBirth.name|localize_translatable_string }}
{% else %}
{{ 'views.Person.view.country_of_birth_unknow'|trans }}
{{ 'Unknown country of birth'|trans }}
{% endif %}
{% endspaceless %}</dd>
@@ -81,15 +81,15 @@ This view should receive those arguments:
{{ include(edit_tmp_name, edit_tmp_args) }}
<figure>
<h2>{{ 'views.Person.view.administrative'|trans }}</h2>
<h2>{{ 'Administrative information'|trans }}</h2>
<dl>
<dt class="inline">{{ 'views.Person.view.nationality'|trans }}</dt>
<dt class="inline">{{ 'Nationality'|trans }}</dt>
<dd>
{% if person.nationality is not null %}
{{ person.nationality.name|localize_translatable_string }}
{% else %}
{{ 'views.Person.view.without_nationality'|trans }}
{{ 'Without nationality'|trans }}
{% endif %}
</dd>
</dl>
@@ -98,14 +98,14 @@ This view should receive those arguments:
{{ include(edit_tmp_name, edit_tmp_args) }}
<figure>
<h2>{{ 'views.Person.view.contact'|trans }}</h2>
<h2>{{ 'Contact information'|trans }}</h2>
<dl>
<dt class="inline">{{ 'views.Person.view.email'|trans }}</dt>
<dt class="inline">{{ 'Email'|trans }}</dt>
<dd><pre>{{ person.email}}&nbsp;</pre></dd>
</dl>
<dl>
<dt class="inline">{{ 'views.Person.view.phonenumber'|trans }}</dt>
<dt class="inline">{{ 'Phonenumber'|trans }}</dt>
<dd><pre>{{ person.phonenumber}}&nbsp;</pre></dd>
</dl>

6
Resources/views/layout.html.twig
View File

@@ -46,12 +46,12 @@
<div class="grid-4">
<p><i class="fa fa-birthday-cake"></i> {% spaceless %}
{% if person.dateOfBirth == null %}
{{ 'person.without_date_of_birth'|trans }}, {{ ('person.gender.' ~
{{ 'Unknown date of birth'|trans }}, {{ ('person.gender.' ~
person.genre)|trans }}
{% else %}
{% transchoice person.genreNumeric
with {'%date%' : person.dateOfBirth.format('d-m-Y')} %}
views.layout.born
{0} Born the %date | {1} Born the %date
{% endtranschoice %}
{% endif %}
{% endspaceless %}</p>
@@ -59,7 +59,7 @@
{% if person.nationality is not null %}
<p><i class="fa fa-flag"></i> {{ person.nationality.name|localize_translatable_string }}</p>
{% else %}
<p class="without_nationality"><i class="fa fa-flag"></i> {% trans %}views.layout.without_nationality{% endtrans %}</p>
<p class="without_nationality"><i class="fa fa-flag"></i> {% trans %}Without nationality{% endtrans %}</p>
{% endif %}
</div>
</div>

2
Resources/views/menu.html.twig
View File

@@ -16,7 +16,7 @@
#}
<div class="grid-4">
<ul class="tab-nav follow-href-path">
<li class="title">{{ 'Menu Person'|trans }}</li>
<li class="title">{{ 'Person Menu'|trans }}</li>
{% for route in routes %}
<li class="{% spaceless %}
{% if route.key == activeRouteKey %}