consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1014 from consul/email-unfeasible-polish

Browse Source 
Email unfeasible polish
This commit is contained in:
Enrique García
2016-03-29 11:48:36 +02:00
parent b640fa887d 595c5485d6
commit a14cc1a575
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/spending_proposals_controller.rb
View File

@@ -1,9 +1,10 @@
class SpendingProposalsController < ApplicationController
include FeatureFlags
before_action :authenticate_user!, except: [:index]
load_and_authorize_resource
before_action :authenticate_user!, except: [:index]
before_action :verify_access, only: [:show]
before_filter -> { flash.now[:notice] = flash[:notice].html_safe if flash[:html_safe] && flash[:notice] }

2
app/views/mailer/unfeasible_spending_proposal.html.erb
View File

@@ -20,7 +20,7 @@
</p>
<p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
<%= t("mailers.unfeasible_spending_proposal.reconsider_html") %>
<%= t("mailers.unfeasible_spending_proposal.reconsider_html", code: @spending_proposal.code) %>
</p>
<p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">

2
config/locales/mailers.en.yml
View File

@@ -24,7 +24,7 @@ en:
hi: "Dear user,"
new_html: "For all these, we invite you to elaborate a <strong>new proposal</strong> that ajusts to the conditions of this process. You can do it following this link: %{url}."
new_href: "new investment project"
reconsider_html: "If you believe that the rejected proposal meets the requirements to be an investment proposal, you can communicate this, <strong>within 48 hours, responding to the email address preparticipativos@madrid.es</strong>. Please include all relevant information to reconsider the proposal as valid."
reconsider_html: "If you believe that the rejected proposal meets the requirements to be an investment proposal, you can communicate this, within 48 hours, responding to the email address preparticipativos@madrid.es. Including the code %{code} in the subject of the email."
sincerely: "Sincerely"
signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation."

2
config/locales/mailers.es.yml
View File

@@ -24,7 +24,7 @@ es:
hi: "Estimado usuario,"
new_html: "Por todo ello, te invitamos a que elabores una <strong>nueva propuesta</strong> que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}."
new_href: "nueva propuesta de inversión"
reconsider_html: "Si consideras que la propuesta rechazada cumple los requisitos para mantenerla como propuesta de inversión, podrás comunicarlo, en el <strong>plazo de 48 horas, al correo preparticipativos@madrid.es</strong>. Por favor incluye toda la información relevante para reconsiderar la propuesta como válida."
reconsider_html: "Si consideras que la propuesta rechazada cumple los requisitos para mantenerla como propuesta de inversión, podrás comunicarlo, en el plazo de 48 horas, al correo preparticipativos@madrid.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu propuesta."
sincerely: "Atentamente"
signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA"
sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación."

1
spec/features/emails_spec.rb
View File

@@ -144,6 +144,7 @@ feature 'Emails' do
expect(email).to have_subject("Your investment project '#{spending_proposal.id}-A#{spending_proposal.administrator.id}' has been marked as unfeasible")
expect(email).to deliver_to(spending_proposal.author.email)
expect(email).to have_body_text(spending_proposal.title)
expect(email).to have_body_text(spending_proposal.code)
expect(email).to have_body_text(spending_proposal.feasible_explanation)
end