Merge pull request #566 from AyuntamientoMadrid/titles

Titles

app/views/debates/index.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('debates.index.title') %><% end %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form_header",
              search_path: debates_path(page: 1),

app/views/devise/confirmations/new.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.confirmations.title") %><% end %>
 <h1 class="text-center"><%= t("devise_views.confirmations.title") %></h1>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>

app/views/devise/passwords/new.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.passwords.new.title") %><% end %>
 <h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= render 'shared/errors', resource: resource %>

app/views/devise/sessions/new.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.sessions.new.title") %><% end %>
 <h2><%= t("devise_views.sessions.new.title") %></h2>
 
 <%# render 'devise/omniauth_form' %>

app/views/organizations/registrations/new.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.organizations.registrations.new.title") %><% end %>
 <h2><%= t("devise_views.organizations.registrations.new.title") %></h2>
 
  <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %>

app/views/pages/accessibility.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.accessibility') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">

app/views/pages/conditions.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.conditions') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">

app/views/pages/more_information.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.more_information') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="more-information text small-12 medium-8 column">

app/views/pages/opendata.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.opendata') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="alert-box info radius text small-12 column">

app/views/pages/privacy.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.privacy') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">

app/views/pages/transparency.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.transparency') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="alert-box info radius text small-12 column">

app/views/proposals/index.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('proposals.index.title') %><% end %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form_header",
              search_path: proposals_path(page: 1),

app/views/users/registrations/new.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.users.registrations.new.title") %><% end %>
 <h2><%= t("devise_views.users.registrations.new.title") %></h2>
 
 <%# render 'devise/omniauth_form' %>

app/views/welcome/highlights.html.erb

@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('welcome.signed_in_home_title') %><% end %>
 <% cache [locale_and_user_status, @list, @debate_votes, @proposal_votes, @paginator.current_page, @paginator.total_pages] do %>
   <section role="main">
     <div class="wrap row">

config/locales/en.yml

@@ -74,6 +74,7 @@ en:
     menu: "Menu"
   debates:
     index:
+      title: Debates
       start_debate: Start a debate
       select_order: Order by
       select_order_long: Order debates by
@@ -148,6 +149,7 @@ en:
         submit_button: "Save changes"
   proposals:
     index:
+      title: Proposals
       start_proposal: Start a proposal
       select_order: Order by
       select_order_long: Order proposals by
@@ -309,7 +311,6 @@ en:
       all: "You are not authorized to %{action} %{subject}."
   welcome:
     signed_in_home_title: Recent activity
-    signed_in_home_title: Actividad reciente
     debates:
       title: "Debate"
       description: "Meet, discuss and share what we think is important in our city."

config/locales/es.yml

@@ -74,6 +74,7 @@ es:
     menu: "Menú"
   debates:
     index:
+      title: Debates
       start_debate: Empieza un debate
       select_order: Ordenar por
       select_order_long: Estás viendo los debates
@@ -148,6 +149,7 @@ es:
         submit_button: "Guardar cambios"
   proposals:
     index:
+      title: Propuestas ciudadanas
       start_proposal: Crea una propuesta
       select_order: Ordenar por
       select_order_long: Estás viendo las propuestas

config/locales/pages.en.yml

@@ -1,5 +1,12 @@
 en:
   pages:
+    titles:
+      more_information: "More information"
+      privacy: "Privacy Policy"
+      transparency: "Transparency"
+      opendata: "Open Data"
+      conditions: "Terms of use"
+      accessibility: "Accessibility"
     conditions:
       "Terms of use"
     privacy:

config/locales/pages.es.yml

@@ -1,5 +1,12 @@
 es:
   pages:
+    titles:
+      more_information: "Más información"
+      privacy: "Política de Privacidad"
+      transparency: "Transparencia"
+      opendata: "Datos abiertos"
+      conditions: "Condiciones de uso"
+      accessibility: "Accesibilidad"
     conditions:
       "Condiciones de uso"
     privacy: