Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets

config/initializers/devise.rb

@@ -12,7 +12,11 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'noreply@consul.es'
+  if Rails.env.test?
+    config.mailer_sender = "noreply@example.org"
+  else
+    config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
+  end
 
   # Configure the class responsible to send e-mails.
   config.mailer = 'DeviseMailer'

config/locales/en.yml

@@ -190,6 +190,7 @@ en:
       debates: Debates
       external_link_blog: Blog
       external_link_opendata: Open data
+      external_link_opendata_url: "/opendata"
       external_link_transparency: Transparency
       external_link_transparency_url: https://transparency.consul
       locale: 'Language:'
@@ -208,7 +209,6 @@ en:
       open: open
       open_city_slogan_html: There are cities that are governed directly by their inhabitants, who <b>discuss</b> the topics they are concerned about, <b>propose</b> ideas to improve their lives and <b>decide</b> among themselves which ones will be carried out.
       open_city_title: Love the city, and it will become a city you love.
-      open_data: Open data
       open_gov: Open government
       proposals: Proposals
       proposal_ballot: Voting
@@ -451,6 +451,7 @@ en:
       districts_list: "Districts list"
       categories: "Categories"
     target_blank_html: " (link opens in new window)"
+    you_are_in: "You are in"
     unflag: Unflag
     outline:
       debates: Debates

config/locales/es.yml

@@ -190,6 +190,7 @@ es:
       debates: Debates
       external_link_blog: Blog
       external_link_opendata: Datos abiertos
+      external_link_opendata_url: "/opendata"
       external_link_transparency: Transparencia
       external_link_transparency_url: https://transparency.consul
       locale: 'Idioma:'
@@ -208,7 +209,6 @@ es:
       open: abierto
       open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que <strong>debaten</strong> sobre temas que les preocupan, <strong>proponen</strong> ideas para mejorar sus vidas y <strong>deciden</strong> entre todas y todos las que se llevan a cabo.
       open_city_title: La ciudad que quieres será la ciudad que quieras.
-      open_data: Datos abiertos
       open_gov: Gobierno %{open}
       proposals: Propuestas
       proposal_ballot: Votaciones
@@ -451,6 +451,7 @@ es:
       districts_list: "Listado de distritos"
       categories: "Categorías"
     target_blank_html: " (se abre en ventana nueva)"
+    you_are_in: "Estás en"
     unflag: Deshacer denuncia
     outline:
       debates: Debates

config/locales/settings.en.yml

@@ -31,3 +31,5 @@ en:
       spending_proposals: Investment projects
       spending_proposal_features:
         voting_allowed: Voting on investment projects
+    mailer_from_name: Origin email name
+    mailer_from_address: Origin email address

config/locales/settings.es.yml

@@ -30,4 +30,6 @@ es:
       signature_sheets: Hojas de firmas
       spending_proposals: Propuestas de inversión
       spending_proposal_features:
-        voting_allowed: Votaciones sobre propuestas de inversión.
+        voting_allowed: Votaciones sobre propuestas de inversión.
+    mailer_from_name: Nombre email remitente
+    mailer_from_address: Dirección email remitente