# HG changeset patch # User ymh # Date 1317715928 -7200 # Node ID d8cb31543a3fcf92249befcc4f38814f81b92670 # Parent 02eab39cf8c61adc5a3a124c5191c5b5638af82e translation and override FOSUserBundle layout diff -r 02eab39cf8c6 -r d8cb31543a3f app/Resources/FOSUserBundle/views/layout.html.twig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/Resources/FOSUserBundle/views/layout.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -0,0 +1,5 @@ +{% extends 'CompanyBaseBundle::layout.html.twig' %} +{% block content %} + {% block fos_user_content %} + {% endblock fos_user_content %} +{% endblock content %} \ No newline at end of file diff -r 02eab39cf8c6 -r d8cb31543a3f app/config/config.yml --- a/app/config/config.yml Fri Sep 30 19:41:38 2011 +0200 +++ b/app/config/config.yml Tue Oct 04 10:12:08 2011 +0200 @@ -4,7 +4,7 @@ framework: #esi: ~ - #translator: { fallback: %locale% } + translator: { fallback: %locale% } secret: %secret% charset: UTF-8 router: { resource: "%kernel.root_dir%/config/routing.yml" } diff -r 02eab39cf8c6 -r d8cb31543a3f app/config/routing.yml --- a/app/config/routing.yml Fri Sep 30 19:41:38 2011 +0200 +++ b/app/config/routing.yml Tue Oct 04 10:12:08 2011 +0200 @@ -1,3 +1,4 @@ + CompanyUserBundle: resource: "@CompanyUserBundle/Resources/config/routing.yml" prefix: / diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/translations/CompanyBaseBundle.en.xliff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Company/BaseBundle/Resources/translations/CompanyBaseBundle.en.xliff Tue Oct 04 10:12:08 2011 +0200 @@ -0,0 +1,79 @@ + + + + + + hello + hello %name% + + + footer.message + © IRI 2011 + + + document.list + Get the document list + + + document.edit.title + Edit document + + + document.edit.submit + Edit + + + document.edit.back + back to the list + + + document.edit.delete + Delete + + + document.index.list + Documents list + + + document.index.actions + Actions + + + document.model.name + Document + + + document.model.col.id + Id + + + document.model.col.title + Title + + + document.model.col.description + Description + + + document.new.creation + Document creation + + + document.new.create + Create + + + document.show.back + back to the list + + + document.show.edit + edit + + + document.show.delete + delete + + + + \ No newline at end of file diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/translations/CompanyBaseBundle.fr.xliff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Company/BaseBundle/Resources/translations/CompanyBaseBundle.fr.xliff Tue Oct 04 10:12:08 2011 +0200 @@ -0,0 +1,79 @@ + + + + + + hello + Bonjour %name% + + + footer.message + © IRI 2011 + + + document.list + Liste de documents + + + document.edit.title + éditer le document + + + document.edit.submit + éditer + + + document.edit.back + retour à la liste + + + document.edit.delete + effacer + + + document.index.list + Liste des documents + + + document.index.actions + Actions + + + document.model.name + Document + + + document.model.col.id + Id + + + document.model.col.title + Titre + + + document.model.col.description + Description + + + document.new.creation + Nouveau document + + + document.new.create + Créer + + + document.show.back + retour à la liste + + + document.show.edit + éditer + + + document.show.delete + effacer + + + + diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/views/Default/index.html.twig --- a/src/Company/BaseBundle/Resources/views/Default/index.html.twig Fri Sep 30 19:41:38 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/Default/index.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -3,13 +3,13 @@ {% block content %}
{% if is_granted("IS_AUTHENTICATED_FULLY") %} -

Hello {{ user.getUsername }} !

+

{{ 'hello'| trans({'%name%':user.getUsername},'CompanyBaseBundle') }} !

{% else %} -

Hello Anonymous !

+

{{ 'hello'| trans({'%name%':'Anonymous'},'CompanyBaseBundle') }} !

{% endif %}
-The list of document +{{ 'document.list' | trans({},'CompanyBaseBundle')}}
{% endblock %} diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/views/Document/edit.html.twig --- a/src/Company/BaseBundle/Resources/views/Document/edit.html.twig Fri Sep 30 19:41:38 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/Document/edit.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -1,25 +1,25 @@ {% extends 'CompanyBaseBundle::layout.html.twig' %} {% block content %} -

Document edit

+

{{'document.edit.title'| trans({},'CompanyBaseBundle')}}

{{ form_widget(edit_form) }}

- +

diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/views/Document/index.html.twig --- a/src/Company/BaseBundle/Resources/views/Document/index.html.twig Fri Sep 30 19:41:38 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/Document/index.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -1,15 +1,15 @@ {% extends 'CompanyBaseBundle::layout.html.twig' %} {% block content %} -

Document list

+

{{'document.index.list' | trans({},'CompanyBaseBundle') }}{# Documents list #}

- - - - + + + + diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/views/Document/new.html.twig --- a/src/Company/BaseBundle/Resources/views/Document/new.html.twig Fri Sep 30 19:41:38 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/Document/new.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -1,19 +1,19 @@ {% extends 'CompanyBaseBundle::layout.html.twig' %} {% block content %} -

Document creation

+

{{'document.new.creation'| trans({},'CompanyBaseBundle')}}

{{ form_widget(form) }}

- +

diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/views/Document/show.html.twig --- a/src/Company/BaseBundle/Resources/views/Document/show.html.twig Fri Sep 30 19:41:38 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/Document/show.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -1,20 +1,20 @@ {% extends 'CompanyBaseBundle::layout.html.twig' %} {% block content %} -

Document

+

{{'document.model.name'| trans({},'CompanyBaseBundle')}}

IdTitleDescriptionActions{{'document.model.col.id' | trans({},'CompanyBaseBundle') }}{{'document.model.col.title' | trans({},'CompanyBaseBundle') }}{{'document.model.col.description' | trans({},'CompanyBaseBundle') }}{{'document.index.actions' | trans({},'CompanyBaseBundle') }}
- + - + - + @@ -23,18 +23,18 @@ diff -r 02eab39cf8c6 -r d8cb31543a3f src/Company/BaseBundle/Resources/views/layout.html.twig --- a/src/Company/BaseBundle/Resources/views/layout.html.twig Fri Sep 30 19:41:38 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/layout.html.twig Tue Oct 04 10:12:08 2011 +0200 @@ -27,22 +27,30 @@ +
+ {% for key, message in app.session.getFlashes() %} +
+ {{ message|trans({}, 'FOSUserBundle') }} +
+ {% endfor %} +
{% endblock %} {% block toolbar %} {% endblock %} + {% block content %} {% endblock %} {% block footer %} {% endblock %}
Id{{'document.model.col.id'| trans({},'CompanyBaseBundle')}}Id {{ entity.id }}
Title{{'document.model.col.title'| trans({},'CompanyBaseBundle')}}Title {{ entity.title }}
Description{{'document.model.col.description'| trans({},'CompanyBaseBundle')}}Description {{ entity.description }}