Mise en place de la version anglaise sommaire.

app/Resources/translations/flash.en.yml

@@ -0,0 +1,9 @@
+
+# FOS
+group.flash.updated: Group has been updated
+group.flash.created: Group has been created
+group.flash.deleted: Group has been deleted
+profile.flash.updated: Profile updated
+change_password.flash.success: Password updated
+registration.flash.user_created: User created
+resetting.flash.success: Password has been initialized

app/Resources/translations/navigationui.en.yml

@@ -0,0 +1,8 @@
+
+container_menu:
+  the_network:          The network
+  my_network:           My network
+  
+top_bar:
+  my_account:           My account
+  logout:              Logout

app/Resources/translations/navigationui.fr.yml

@@ -0,0 +1,8 @@
+
+container_menu:
+  the_network:          Le réseau
+  my_network:           Mon réseau
+  
+top_bar:
+  my_account:           Mon compte
+  logout:               Déconnexion

app/Resources/translations/network.en.yml

@@ -0,0 +1,13 @@
+
+search:
+  search:               Search
+  return:               Return
+  search_u_n_g:         Search users and groups
+  users:                Users
+  groups:               Groups
+  no_result:            No result
+  form:
+    submit_value:       Search
+users:                Users
+groups:               Groups
+followed_by:          You're followed by

app/Resources/translations/network.fr.yml

@@ -0,0 +1,13 @@
+
+search:
+  search:               Rechercher
+  return:               Retour
+  search_u_n_g:         Rechercher des utilisateurs et des groupes
+  users:                 Utilisateurs
+  groups:               Groupes
+  no_result:            Il n'y a aucun résultat a votre recherche
+  form:
+    submit_value:       Rechercher
+users:                Utilisateurs
+groups:               Groupes
+followed_by:          Vous êtes suivis par

app/Resources/translations/userform.en.yml

@@ -0,0 +1,4 @@
+
+password.actual: Actual
+password.new.first: New
+password.new.second: New (check)

app/Resources/translations/userform.fr.yml

@@ -0,0 +1,4 @@
+
+password.actual: Actuel
+password.new.first: Nouveau
+password.new.second: Nouveau (vérification)

app/Resources/translations/userui.en.yml

@@ -0,0 +1,11 @@
+
+my_account: 
+  title:          My account
+  username:         Username
+  email:            Email
+  favorite_tags:    Favorite tags
+  change_password:  Change my password
+  change_email:     Change my email
+  
+connexion:
+  password_lost:    Password lost ?

app/Resources/translations/userui.fr.yml

@@ -0,0 +1,11 @@
+
+my_account: 
+  title:          Mon compte
+  username:         Nom d'utilisateur
+  email:            Adresse email
+  favorite_tags:    Vos tags préférés
+  change_password:  Changer mon mot de passe
+  change_email:     Changer mon adresse email
+  
+connection:
+  password_lost:    Mot de passe perdu ?

src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig

@@ -2,12 +2,12 @@
 <ul id="top-tabs">
   <li {% if active == 'public' %} class="active" {% endif %}>
     <a href="{{ path('home') }}">
-      Le réseau
+      {{ 'container_menu.the_network'|trans({}, 'navigationui') }}
     </a>
   </li>
   <li {% if active == 'private' %} class="active" {% endif %}>
     <a href="{{ path('mynetwork_index') }}">
-      Mon réseau
+      {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
     </a>
   </li>
 </ul>

src/Muzich/CoreBundle/Resources/views/SearchElement/form.html.twig

@@ -1,4 +1,5 @@
 <form action="{{ path('search_elements') }}" method="post" {{ form_enctype(search_form) }}>
+  
   {{ form_errors(search_form) }}
 
   {{ form_row(search_form.network) }}

src/Muzich/CoreBundle/Resources/views/Tag/tagFavoritesForm.html.twig

@@ -1,4 +1,5 @@
 <form action="{{ path('update_tag_favorites', { 'redirect' : redirect }) }}" method="post" {{ form_enctype(form) }}>
+  
   {{ form_errors(form) }}
 
   {{ form_row(form.tags) }}

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig

@@ -5,11 +5,11 @@
 {% block content %}
 
   <a class="link_navigation" href="{{ path('mynetwork_search') }}" >
-    Rechercher
+    {{ 'search.search'|trans({}, 'network') }}
   </a>
   
   {% if followeds_users %}
-    <b>Utilisateurs</b>
+    <b>{{ 'users'|trans({}, 'network') }}</b>
     <ul class="inline">
     {% for user in followeds_users %} 
       <li>
@@ -20,7 +20,7 @@
   {% endif %}
   
   {% if followeds_groups %}
-    <b>Groupes</b>
+    <b>{{ 'groups'|trans({}, 'network') }}</b>
     <ul class="inline">
     {% for group in followeds_groups %} 
       <li>
@@ -31,7 +31,7 @@
   {% endif %}
   
   {% if followers_users %}
-    <b>Vous êtes suivis par</b>
+    <b>{{ 'followed_by'|trans({}, 'network') }}</b>
     <ul class="inline">
     {% for user in followers_users %} 
       <li>

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig

@@ -5,10 +5,10 @@
 {% block content %}
 
   <a class="link_navigation" href="{{ path('mynetwork_index') }}" >
-    Retour
+    {{ 'search.return'|trans({}, 'network') }}
   </a>
   
-  <b>Rechercher des utilisateurs et des groupes</b>
+  <b>{{ 'search.search_u_n_g'|trans({}, 'network') }}</b>
   
   <form action="{{ path('mynetwork_search') }}" method="post" {{ form_enctype(search_form) }}>
     
@@ -18,14 +18,14 @@
 
     {{ form_rest(search_form) }}
 
-    <input type="submit" />
+    <input type="submit" value="{{ 'search.form.submit_value'|trans({}, 'network') }}" />
   </form>
   
   {% if results.users|length or results.groups|length %}
   
     {% if results.users %}
 
-      <b>Utilisateurs</b>
+      <b>{{ 'search.users'|trans({}, 'network') }}</b>
       
       <ul class="inline">
       {% for user in results.users %} 
@@ -39,7 +39,7 @@
   
     {% if results.groups %}
 
-      <b>Groupes</b>
+      <b>{{ 'search.groups'|trans({}, 'network') }}</b>
       
       <ul class="inline">
       {% for group in results.groups %} 
@@ -53,7 +53,7 @@
   
   {% elseif search_done %}
       
-      <p>Il n'y a aucun résultat a votre recherche</p>
+      <p>{{ 'search.no_result'|trans({}, 'network') }}</p>
       
   {% endif %}
 

src/Muzich/UserBundle/Resources/views/Account/topBar.html.twig

@@ -1,27 +1,14 @@
 
 {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-<div id="top_bar">
+  <div id="top_bar">
 
-  {#<ul>
-    <li>
-      <a href="{{ path('my_account') }}" >
-        Mon compte
-      </a>
-    </li>
-    <li>
-      <a href="{{ path('fos_user_security_logout') }}" >
-        Déconnexion
-      </a>
-    </li>
-  </ul>#}
-  
-  <a href="{{ path('my_account') }}" >
-    Mon compte
-  </a>
-  
-  <a href="{{ path('fos_user_security_logout') }}" >
-    Déconnexion
-  </a>
-  
-</div>
+    <a href="{{ path('my_account') }}" >
+      {{ 'top_bar.my_account'|trans({}, 'navigationui') }}
+    </a>
+
+    <a href="{{ path('fos_user_security_logout') }}" >
+      {{ 'top_bar.logout'|trans({}, 'navigationui') }}
+    </a>
+
+  </div>
 {% endif %}

src/Muzich/UserBundle/Resources/views/Security/change_password_form.html.twig

@@ -0,0 +1,21 @@
+{{ form_errors(form) }}
+    
+  <div class="field">
+    {{ form_label(form.current, 'password.actual'|trans({}, 'userform')) }}
+    {{ form_errors(form.current) }}
+    {{ form_widget(form.current) }}
+  </div>
+
+  <div class="field">
+    {{ form_label(form.new.first, 'password.new.first'|trans({}, 'userform')) }}
+    {{ form_errors(form.new.first) }}
+    {{ form_widget(form.new.first) }}
+  </div>
+
+  <div class="field">
+    {{ form_label(form.new.second, 'password.new.second'|trans({}, 'userform')) }}
+    {{ form_errors(form.new.second) }}
+    {{ form_widget(form.new.second) }}
+  </div>
+
+{{ form_rest(form) }}

src/Muzich/UserBundle/Resources/views/Security/login.html.twig

@@ -15,4 +15,6 @@
 
       <input type="submit" id="_submit" name="_submit" value="{{ 'security.login.submit'|trans({}, 'FOSUserBundle') }}" />
   </form>
-</div>
+</div>
+
+<a href="{{ path('fos_user_resetting_request') }}">{{ 'connexion.password_lost'|trans({}, 'userui') }}</a>

src/Muzich/UserBundle/Resources/views/User/account.html.twig

@@ -4,40 +4,35 @@
 
 {% block content %}
 
-  <h2>Mon compte</h2>
+  <h2>{{ 'my_account.title'|trans({}, 'userui') }}</h2>
   
   <ul>
     <li>
-      <b>Nom d'utilisateur</b>: {{ user.name }}
+      <b>{{ 'my_account.username'|trans({}, 'userui') }}</b>: {{ user.name }}
     </li>
     <li>
-      <b>Adresse email</b>: {{ user.email }}
+      <b>{{ 'my_account.email'|trans({}, 'userui') }}</b>: {{ user.email }}
     </li>
   </ul>
   
-  <h3>Vos tags préférés</h3>
+  <h3>{{ 'my_account.favorite_tags'|trans({}, 'userui') }}</h3>
   
   {% include "MuzichCoreBundle:Tag:tagFavoritesForm.html.twig" with { 
     'form': form_tags_favorites,
     'redirect' : 'account'
   } %}
   
-  <h3>Changer mon mot de passe</h3>
+  <h3>{{ 'my_account.change_password'|trans({}, 'userui') }}</h3>
   
   <form action="{{ path('change_password') }}" method="post" {{ form_enctype(form_password) }}>
-    {{ form_errors(form_password) }}
-
-    {{ form_row(form_password.current) }}
-      
-    {{ form_row(form_password.new.first) }}
-      
-    {{ form_row(form_password.new.second) }}
-      
-    {{ form_rest(form_password) }}
+    
+    {% include "MuzichUserBundle:Security:change_password_form.html.twig" with { 
+      'form': form_password
+    } %}
 
     <input type="submit" />
   </form>
   
-  <h3>Changer mon adresse email</h3>
+  <h3>{{ 'my_account.change_email'|trans({}, 'userui') }}</h3>
     
 {% endblock %}