diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
index f8a89db70..5013904a1 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
@@ -33,11 +33,12 @@
{% endfor %}
{% if resources|length == 0 and charges|length == 0 %}
-
-
+ {#
#}
+ {#
{{ "There isn't any element recorded"|trans }}
-
-
+
#}
+ {#
#}
+
{% else %}
{{ 'Actual budget'|trans }}
@@ -57,6 +58,8 @@
{% endif %}
+{% endif %}
+
{{ 'Past budget'|trans }}
{% if pastCharges|length > 0 or pastResources|length > 0 %}
@@ -100,4 +103,4 @@
#}
-{% endif %}
+
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
index a75221ac5..d06e55ccf 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
@@ -19,9 +19,9 @@
{{ f.amount|format_currency('EUR') }} |
{% if f.endDate is not null %}
- {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': f.startDate|format_date('short'), '%endDate%': f.endDate|format_date('short') } ) }}
+ {{ f.startDate|format_date('short') ~ ' - ' ~ f.endDate|format_date('short') }}
{% else %}
- {{ 'Valid since %startDate%'|trans( { '%startDate%': f.startDate|format_date('short') } ) }}
+ {{ f.startDate|format_date('short') ~ ' - ...' }}
{% endif %}
|
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
index 00267d2fd..d3b9ef71b 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
@@ -3,15 +3,15 @@
{% set indexPage = 'chill_budget_elements_index' %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
- {% set title = 'Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
{% else %}
{% set template = '@ChillPerson/Household/layout.html.twig' %}
{% set indexPage = 'chill_budget_elements_household_index' %}
{% set activeRouteKey = '' %}
{% set household = element.household %}
- {% set title = 'Charge for household %household%'|trans({ '%household%' : household.id } ) %}
{% endif %}
+{% set title = 'Charge' %}
+
{% extends template %}
{% block title title %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
index f583312d2..110aed9fe 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
@@ -3,15 +3,15 @@
{% set indexPage = 'chill_budget_elements_index' %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
- {% set title = 'Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
{% else %}
{% set template = '@ChillPerson/Household/layout.html.twig' %}
{% set indexPage = 'chill_budget_elements_household_index' %}
{% set activeRouteKey = '' %}
{% set household = element.household %}
- {% set title = 'Resource for household %household%'|trans({ '%household%' : household.id } ) %}
{% endif %}
+{% set title = 'Resource' %}
+
{% extends template %}
{% block title title %}
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
index 2fe688740..c6bcf025d 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
@@ -51,7 +51,7 @@ Are you sure you want to remove the ressource "%type%" associated to "%name%" ?:
Are you sure you want to remove the charge "%type%" associated to "%name%" ?: Êtes-vous sûr·e de vouloir supprimer la charge de nature "%type%" associée à %name% ?
Resource deleted: Ressource supprimée
Charge deleted: Charge supprimée
-Charge created: Charge créée
+Charge created: Charge créée
Resource created: Ressource créée
Resource updated: Resource mise à jour
Charge updated: charge mise à jour
@@ -71,5 +71,5 @@ charge.help.not-concerned: Non concerné
Budget calculator: Calculs et indices sur le budget
Budget calculator result: Résultats
-'Valid since %startDate% until %endDate%': '%startDate% - %endDate%'
-'Valid since %startDate%': '%startDate% - ...'
\ No newline at end of file
+Valid since %startDate% until %endDate%: Valide depuis le %startDate% jusqu'au %endDate%
+Valid since %startDate%: Valide depuis le %startDate%
\ No newline at end of file
|