From 0df2ab4ef16ade6547db4f707472cc9506c12892 Mon Sep 17 00:00:00 2001
From: Marc Florisson
Date: Mon, 17 Nov 2014 12:26:54 +0100
Subject: fix translations for login page

---
 app/views/devise/sessions/new.html.erb | 32 ++++++++++++++------------------
 config/locales/devise.en.yml           |  7 ++++++-
 config/locales/devise.fr.yml           |  5 +++++
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index dc06a3ea2..9334bab35 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,21 +1,17 @@
 <div id="sessions_new" class="row">
   <div class="col-md-8 product_summary">
-    <h2>Bienvenue sur Chouette</h2>
-    <p>
-     Chouette est un logiciel Open Source de saisie, de visualisation et d'échange d'offre de transport public planifiée.
-    </p>
-    <p>
-      Ce logiciel est déployé en mode Saas et se veut ouvert :      
-    </p>
+    <h2><%= t(".welcome") %></h2>
+    <p><%= t(".introduction1") %></p>
+    <p><%= t(".introduction2") %></p>
     <ul>
-      <li>- choix de plusieurs fonds cartographiques</li>
-      <li>- échange de données en différents normes (Neptune, ...) et standard (GTFS, ...)</li>
+      <li>- <%= t(".introduction_item1") %></li>
+      <li>- <%= t(".introduction_item2") %></li>
     </ul>
   </div>
   <div class="col-md-4 login">
     <div class="panel panel-default">
       <div class="panel-body">
-        <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :wrapper => "form_without_label" ) do |form| %>    
+        <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :wrapper => "form_without_label" ) do |form| %>
           <%= form.input :email, :label => false, :placeholder => t("helpers.label.user.email"), input_html: { :class => "form-control" } %>
           <div class="row">
             <div class="col-md-6">
@@ -42,24 +38,24 @@
     <% if Rails.application.config.accept_user_creation %>
     <div class="panel panel-default">
       <div class="panel-heading"><%= t("devise.registrations.new.title") %></div>
-      <div class="panel-body">        
+      <div class="panel-body">
         <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label" ) do |form| %>
         <%= form.simple_fields_for :organisation, Organisation.new do |organisation| %>
           <%= organisation.input :name, :label => false, :placeholder => t("helpers.label.user.organisation_name"), input_html: { :class => "form-control" } %>
         <% end %>
         <% if resource.respond_to?( :name) %>
-          <%= form.input :name, :label => false, :placeholder => t("helpers.label.user.name"), input_html: { :class => "form-control" }  %> 
-        <% end %>    
-        <%= form.input :email, :label => false, :placeholder => t("helpers.label.user.email"), input_html: { :class => "form-control" } %> 
-        <%= form.input :password, :as => :password, :label => false, :placeholder => t("helpers.label.user.password"), input_html: { :class => "form-control" } %> 
-        <%= form.input :password_confirmation, :as => :password, :label => false, :placeholder => t("helpers.label.user.password_confirmation"), input_html: { :class => "form-control" } %> 
-        
+          <%= form.input :name, :label => false, :placeholder => t("helpers.label.user.name"), input_html: { :class => "form-control" }  %>
+        <% end %>
+        <%= form.input :email, :label => false, :placeholder => t("helpers.label.user.email"), input_html: { :class => "form-control" } %>
+        <%= form.input :password, :as => :password, :label => false, :placeholder => t("helpers.label.user.password"), input_html: { :class => "form-control" } %>
+        <%= form.input :password_confirmation, :as => :password, :label => false, :placeholder => t("helpers.label.user.password_confirmation"), input_html: { :class => "form-control" } %>
+
         <%= form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info" %>
         <% end %>
       </div>
     </div>
     <% end %>
-    
+
   </div>
 </div>
 
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 933eca4a3..017e167bd 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -6,6 +6,11 @@ en:
       new:
         title: Sign in
         commit: Sign in
+        welcome: "Welcome on Chouette"
+        introduction1: "Chouette is an Open Source software that can read and edit whole public transport service for passengers."
+        introduction2: "The software is delivered in Saas way and gives you :"
+        introduction_item1: "map view of lines, routes, journeys, stops, connections..."
+        introduction_item2: "data exchange functions in different formats like NEPTUNE, GTFS"
     confirmations:
       new:
         title: Resend confirmation instructions
@@ -42,4 +47,4 @@ en:
         password: Password
         password_confirmation: Password confirmation
         current_password: Current password
-        remember_me: Remember me
\ No newline at end of file
+        remember_me: Remember me
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index cb45578e5..c5885effc 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -10,6 +10,11 @@ fr:
       new:
         title: Se connecter
         commit: Se connecter
+        welcome: "Bienvenue sur Chouette"
+        introduction1: "Chouette est un logiciel Open Source d'édition et d'échange d'offre de transport public planifiée."
+        introduction2: "Le logiciel est mis à disposition en mode Saas et se veut ouvert :"
+        introduction_item1: "visualisation cartographique des lignes, des arrêts, des parcours..."
+        introduction_item2: "échange de données selon différents formats (Neptune, GTFS)"
     confirmations:
       new:
         title: Renvoyer le mail de confirmation
-- 
cgit v1.2.3