Merge pull request #256 from AyuntamientoMadrid/improve_emails

Improve emails

config/environments/development.rb

@@ -16,6 +16,7 @@ Rails.application.configure do
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
   config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+  config.action_mailer.asset_host = "http://localhost:3000"
 
   # Deliver emails to a development mailbox at /letter_opener
   config.action_mailer.delivery_method = :letter_opener

config/initializers/devise.rb

@@ -266,3 +266,7 @@ Devise.setup do |config|
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
 end
+
+Rails.application.config.to_prepare do
+  Devise::Mailer.layout "mailer" # email.haml or email.erb
+end

config/locales/devise_views.en.yml

@@ -6,17 +6,20 @@ en:
       submit: "Resend confirmation instructions"
     mailer:
       confirmation_instructions:
+        title: "Welcome to open government"
         welcome: "Welcome"
         text: "You can confirm your account email through the link below:"
         confirm_link: "Confirm my account"
       reset_password_instructions:
         hello: "Hello"
-        text: "Someone has requested a link to change your password. You can do this through the link below."
+        title: Change your password
+        text: "Someone has requested to change your password. You can do this through the link below:"
         change_link: "Change my password"
         ignore_text: "If you didn't request this, please ignore this email."
         info_text: "Your password won't change until you access the link above and create a new one."
       unlock_instructions:
         hello: "Hello"
+        title: Your account has been locked
         info_text: "Your account has been locked due to an excessive number of unsuccessful sign in attempts."
         instructions_text: "Click the link below to unlock your account:"
         unlock_link: "Unlock my account"

config/locales/devise_views.es.yml

@@ -6,17 +6,20 @@ es:
       submit: "Reenviar instrucciones de confirmación"
     mailer:
       confirmation_instructions:
-        welcome: "Bienvenido"
+        title: "Bienvenido/a a gobierno abierto"
+        welcome: "Bienvenido/a"
         text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
         confirm_link: "Confirmar mi cuenta"
       reset_password_instructions:
         hello: "Hola"
-        text: "Se ha solicitado un enlace para cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
-        change_link: "cambiar mi contraseña"
-        ignore_text: "Si tu no lo has solicitado, puedes ignorar este email"
+        title: "Cambiar tu contraseña"
+        text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
+        change_link: "Cambiar mi contraseña"
+        ignore_text: "Si tu no lo has solicitado, puedes ignorar este email."
         info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
       unlock_instructions:
         hello: "Hola"
+        title: Tu cuenta ha sido bloqueada
         info_text: "Tu cuenta ha sido bloqueada debido a un excesivo número de intentos fallidos de alta."
         instructions_text: "Sigue el siguiente enlace para desbloquear tu cuenta:"
         unlock_link: "Desbloquear mi cuenta"

config/locales/mailers.en.yml

@@ -1,8 +1,10 @@
 en:
   mailers:
     comment:
-      hi: "Hello, %{recipient}"
-      new_comment_by: "There'is a new comment by %{commenter}"
+      hi: Hello
+      title: New comment on your debate
+      new_comment_by_html: "There'is a new comment by <b<%{commenter}</b> on"
     reply:
-      hi: "Hello, %{recipient}"
-      new_reply_by: "There'is a new reply by %{commenter} to your comment"
+      hi: Hello
+      title: New reply on your comment
+      new_reply_by_html: "There'is a new reply by <b>%{commenter}</b> to your comment on"

config/locales/mailers.es.yml

@@ -1,8 +1,10 @@
 es:
   mailers:
     comment:
-      hi: "Hola, %{recipient}"
-      new_comment_by: "Hay un nuevo comentario de %{commenter}"
+      hi: Hola
+      title: Nuevo comentario en tu debate
+      new_comment_by_html: "Hay un nuevo comentario de <b>%{commenter}</b> en"
     reply:
-      hi: "Hola, %{recipient}"
-      new_reply_by: "Hay una nueva respuesta de %{commenter} a tu comentario"
+      hi: Hola
+      title: Nueva respuesta a tu comentario
+      new_reply_by_html: "Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en"