--- /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
--- 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" }
--- 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: /
--- /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 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+ <file source-language="en" datatype="plaintext" original="file.ext">
+ <body>
+ <trans-unit id="1">
+ <source>hello</source>
+ <target>hello %name%</target>
+ </trans-unit>
+ <trans-unit id="2">
+ <source>footer.message</source>
+ <target>© IRI 2011</target>
+ </trans-unit>
+ <trans-unit id="3">
+ <source>document.list</source>
+ <target>Get the document list</target>
+ </trans-unit>
+ <trans-unit id="4">
+ <source>document.edit.title</source>
+ <target>Edit document</target>
+ </trans-unit>
+ <trans-unit id="5">
+ <source>document.edit.submit</source>
+ <target>Edit</target>
+ </trans-unit>
+ <trans-unit id="6">
+ <source>document.edit.back</source>
+ <target>back to the list</target>
+ </trans-unit>
+ <trans-unit id="7">
+ <source>document.edit.delete</source>
+ <target>Delete</target>
+ </trans-unit>
+ <trans-unit id="8">
+ <source>document.index.list</source>
+ <target>Documents list</target>
+ </trans-unit>
+ <trans-unit id="9">
+ <source>document.index.actions</source>
+ <target>Actions</target>
+ </trans-unit>
+ <trans-unit id="10">
+ <source>document.model.name</source>
+ <target>Document</target>
+ </trans-unit>
+ <trans-unit id="11">
+ <source>document.model.col.id</source>
+ <target>Id</target>
+ </trans-unit>
+ <trans-unit id="12">
+ <source>document.model.col.title</source>
+ <target>Title</target>
+ </trans-unit>
+ <trans-unit id="13">
+ <source>document.model.col.description</source>
+ <target>Description</target>
+ </trans-unit>
+ <trans-unit id="14">
+ <source>document.new.creation</source>
+ <target>Document creation</target>
+ </trans-unit>
+ <trans-unit id="15">
+ <source>document.new.create</source>
+ <target>Create</target>
+ </trans-unit>
+ <trans-unit id="16">
+ <source>document.show.back</source>
+ <target>back to the list</target>
+ </trans-unit>
+ <trans-unit id="17">
+ <source>document.show.edit</source>
+ <target>edit</target>
+ </trans-unit>
+ <trans-unit id="18">
+ <source>document.show.delete</source>
+ <target>delete</target>
+ </trans-unit>
+ </body>
+ </file>
+</xliff>
\ No newline at end of file
--- /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 @@
+<?xml version='1.0' encoding='utf-8'?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+ <file source-language="en" datatype="plaintext" original="file.ext" target-language="fr">
+ <body>
+ <trans-unit id="1">
+ <source>hello</source>
+ <target>Bonjour %name%</target>
+ </trans-unit>
+ <trans-unit id="2">
+ <source>footer.message</source>
+ <target>© IRI 2011</target>
+ </trans-unit>
+ <trans-unit id="3">
+ <source>document.list</source>
+ <target>Liste de documents</target>
+ </trans-unit>
+ <trans-unit id="4">
+ <source>document.edit.title</source>
+ <target>éditer le document</target>
+ </trans-unit>
+ <trans-unit id="5">
+ <source>document.edit.submit</source>
+ <target>éditer</target>
+ </trans-unit>
+ <trans-unit id="6">
+ <source>document.edit.back</source>
+ <target>retour à la liste</target>
+ </trans-unit>
+ <trans-unit id="7">
+ <source>document.edit.delete</source>
+ <target>effacer</target>
+ </trans-unit>
+ <trans-unit id="8">
+ <source>document.index.list</source>
+ <target>Liste des documents</target>
+ </trans-unit>
+ <trans-unit id="9">
+ <source>document.index.actions</source>
+ <target>Actions</target>
+ </trans-unit>
+ <trans-unit id="10">
+ <source>document.model.name</source>
+ <target>Document</target>
+ </trans-unit>
+ <trans-unit id="11">
+ <source>document.model.col.id</source>
+ <target>Id</target>
+ </trans-unit>
+ <trans-unit id="12">
+ <source>document.model.col.title</source>
+ <target>Titre</target>
+ </trans-unit>
+ <trans-unit id="13">
+ <source>document.model.col.description</source>
+ <target>Description</target>
+ </trans-unit>
+ <trans-unit id="14">
+ <source>document.new.creation</source>
+ <target>Nouveau document</target>
+ </trans-unit>
+ <trans-unit id="15">
+ <source>document.new.create</source>
+ <target>Créer</target>
+ </trans-unit>
+ <trans-unit id="16">
+ <source>document.show.back</source>
+ <target>retour à la liste</target>
+ </trans-unit>
+ <trans-unit id="17">
+ <source>document.show.edit</source>
+ <target>éditer</target>
+ </trans-unit>
+ <trans-unit id="18">
+ <source>document.show.delete</source>
+ <target>effacer</target>
+ </trans-unit>
+ </body>
+ </file>
+</xliff>
--- 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 %}
<div>
{% if is_granted("IS_AUTHENTICATED_FULLY") %}
- <h1>Hello {{ user.getUsername }} !</h1>
+ <h1>{{ 'hello'| trans({'%name%':user.getUsername},'CompanyBaseBundle') }} !</h1>
{% else %}
- <h1>Hello Anonymous !</h1>
+ <h1>{{ 'hello'| trans({'%name%':'Anonymous'},'CompanyBaseBundle') }} !</h1>
{% endif %}
</div>
<div>
-<a href="{{ url('document') }}" >The list of document</a>
+<a href="{{ url('document') }}">{{ 'document.list' | trans({},'CompanyBaseBundle')}}</a>
</div>
{% endblock %}
--- 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 %}
-<h1>Document edit</h1>
+<h1>{{'document.edit.title'| trans({},'CompanyBaseBundle')}}</h1>
<form action="{{ path('document_update', { 'id': entity.id }) }}" method="post" {{ form_enctype(edit_form) }}>
{{ form_widget(edit_form) }}
<p>
- <button type="submit">Edit</button>
+ <button type="submit">{{'document.edit.submit'| trans({},'CompanyBaseBundle')}}</button>
</p>
</form>
<ul class="record_actions">
<li>
<a href="{{ path('document') }}">
- Back to the list
+ {{'document.edit.back'| trans({},'CompanyBaseBundle')}}
</a>
</li>
<li>
<form action="{{ path('document_delete', { 'id': entity.id }) }}" method="post">
{{ form_widget(delete_form) }}
- <button type="submit">Delete</button>
+ <button type="submit">{{'document.edit.delete'| trans({},'CompanyBaseBundle')}}</button>
</form>
</li>
</ul>
--- 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 %}
-<h1>Document list</h1>
+<h1>{{'document.index.list' | trans({},'CompanyBaseBundle') }}{# Documents list #}</h1>
<table class="records_list">
<thead>
<tr>
- <th>Id</th>
- <th>Title</th>
- <th>Description</th>
- <th>Actions</th>
+ <th>{{'document.model.col.id' | trans({},'CompanyBaseBundle') }}</th>
+ <th>{{'document.model.col.title' | trans({},'CompanyBaseBundle') }}</th>
+ <th>{{'document.model.col.description' | trans({},'CompanyBaseBundle') }}</th>
+ <th>{{'document.index.actions' | trans({},'CompanyBaseBundle') }}</th>
</tr>
</thead>
<tbody>
--- 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 %}
-<h1>Document creation</h1>
+<h1>{{'document.new.creation'| trans({},'CompanyBaseBundle')}}</h1>
<form action="{{ path('document_create') }}" method="post" {{ form_enctype(form) }}>
{{ form_widget(form) }}
<p>
- <button type="submit">Create</button>
+ <button type="submit">{{'document.new.create'| trans({},'CompanyBaseBundle')}}</button>
</p>
</form>
<ul class="record_actions">
<li>
<a href="{{ path('document') }}">
- Back to the list
+ {{'document.edit.back' | trans({},'CompanyBaseBundle')}}
</a>
</li>
</ul>
--- 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 %}
-<h1>Document</h1>
+<h1>{{'document.model.name'| trans({},'CompanyBaseBundle')}}</h1>
<table class="record_properties">
<tbody>
<tr>
- <th>Id</th>
+ <th>{{'document.model.col.id'| trans({},'CompanyBaseBundle')}}Id</th>
<td>{{ entity.id }}</td>
</tr>
<tr>
- <th>Title</th>
+ <th>{{'document.model.col.title'| trans({},'CompanyBaseBundle')}}Title</th>
<td>{{ entity.title }}</td>
</tr>
<tr>
- <th>Description</th>
+ <th>{{'document.model.col.description'| trans({},'CompanyBaseBundle')}}Description</th>
<td>{{ entity.description }}</td>
</tr>
</tbody>
@@ -23,18 +23,18 @@
<ul class="record_actions">
<li>
<a href="{{ path('document') }}">
- Back to the list
+ {{'document.show.back'| trans({},'CompanyBaseBundle')}}
</a>
</li>
<li>
<a href="{{ path('document_edit', { 'id': entity.id }) }}">
- Edit
+ {{'document.show.edit'| trans({},'CompanyBaseBundle')}}
</a>
</li>
<li>
<form action="{{ path('document_delete', { 'id': entity.id }) }}" method="post">
{{ form_widget(delete_form) }}
- <button type="submit">Delete</button>
+ <button type="submit">{{'document.show.delete'| trans({},'CompanyBaseBundle')}}</button>
</form>
</li>
</ul>
--- 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 @@
<div id="header">
<div><a href="{{ url('CompanyBaseBundle_homepage') }}">Company</a></div>
{% if is_granted("IS_AUTHENTICATED_FULLY") %}
- <div><a href="{{ url('fos_user_profile_show') }}">{{ app.user.username }}</a>|<a href="{{ url('fos_user_security_logout') }}">{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}</a></div>
+ <div><a href="{{ url('fos_user_profile_show') }}">{{ app.user.username }}</a> | <a href="{{ url('fos_user_security_logout') }}">{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}</a></div>
{% else %}
- <a href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans({}, 'FOSUserBundle') }}</a>
+ <a href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans({}, 'FOSUserBundle') }}</a> | <a href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans({}, 'FOSUserBundle') }}</a>
{% endif %}
</div>
+ <div>
+ {% for key, message in app.session.getFlashes() %}
+ <div class="{{ key }}">
+ {{ message|trans({}, 'FOSUserBundle') }}
+ </div>
+ {% endfor %}
+ </div>
{% endblock %}
{% block toolbar %}
{% endblock %}
+
{% block content %}
{% endblock %}
{% block footer %}
<div id="footer">
- <p>footer</p>
+ <p>{{ 'footer.message' | trans({}, 'CompanyBaseBundle')}}</p>
</div>
{% endblock %}