From cc117540a1c80b66dcbb68c4c5e5c4036768ad77 Mon Sep 17 00:00:00 2001 From: Muz Date: Tue, 15 Aug 2017 13:02:40 -0500 Subject: [PATCH 1/3] Don't extraneously include the hostname on links to workshops for emails --- app/views/user_mailer/workshop_facilitator_request.html.haml | 4 ++-- .../workshop_facilitator_request_approved.html.haml | 2 +- .../user_mailer/workshop_facilitator_request_denied.html.haml | 2 +- .../user_mailer/workshop_original_content_changed.html.haml | 2 +- app/views/user_mailer/workshop_translated.html.haml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/user_mailer/workshop_facilitator_request.html.haml b/app/views/user_mailer/workshop_facilitator_request.html.haml index 620baea..34639b5 100644 --- a/app/views/user_mailer/workshop_facilitator_request.html.haml +++ b/app/views/user_mailer/workshop_facilitator_request.html.haml @@ -4,8 +4,8 @@ %p =_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: " - - workshop_link = @host + view_workshop_url(@conference.slug, @workshop.id).html_safe + - workshop_link = view_workshop_url(@conference.slug, @workshop.id).html_safe %a{href: workshop_link}=_!(workshop_link) %p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions." - \ No newline at end of file + diff --git a/app/views/user_mailer/workshop_facilitator_request_approved.html.haml b/app/views/user_mailer/workshop_facilitator_request_approved.html.haml index 1e979e0..b1f8d1b 100644 --- a/app/views/user_mailer/workshop_facilitator_request_approved.html.haml +++ b/app/views/user_mailer/workshop_facilitator_request_approved.html.haml @@ -1,4 +1,4 @@ %p - - workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id) + - workshop_link = link_to (_!@workshop.title), view_workshop_url(@conference.slug, @workshop.id) =_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link.html_safe}.", vars: {workshop_title: workshop_link.html_safe} diff --git a/app/views/user_mailer/workshop_facilitator_request_denied.html.haml b/app/views/user_mailer/workshop_facilitator_request_denied.html.haml index 6697f2b..40282ed 100644 --- a/app/views/user_mailer/workshop_facilitator_request_denied.html.haml +++ b/app/views/user_mailer/workshop_facilitator_request_denied.html.haml @@ -1,3 +1,3 @@ %p - - workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id).html_safe + - workshop_link = link_to (_!@workshop.title), view_workshop_url(@conference.slug, @workshop.id).html_safe =_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", vars: {workshop_title: workshop_link.html_safe} diff --git a/app/views/user_mailer/workshop_original_content_changed.html.haml b/app/views/user_mailer/workshop_original_content_changed.html.haml index d7a88ff..c393c37 100644 --- a/app/views/user_mailer/workshop_original_content_changed.html.haml +++ b/app/views/user_mailer/workshop_original_content_changed.html.haml @@ -10,5 +10,5 @@ %p =_'email.workshop.paragraph.view_workshop',"You can view the workshop here: " - - workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id) + - workshop_link = view_workshop_path(@workshop.conference.slug, @workshop.id) %a{href: workshop_link}=workshop_link diff --git a/app/views/user_mailer/workshop_translated.html.haml b/app/views/user_mailer/workshop_translated.html.haml index 9b39b31..ecb0df2 100644 --- a/app/views/user_mailer/workshop_translated.html.haml +++ b/app/views/user_mailer/workshop_translated.html.haml @@ -10,5 +10,5 @@ %p =_'email.workshop.paragraph.view_workshop',"You can view the workshop here: " - - workshop_link = @host + view_workshop_url(@workshop.conference.slug, @workshop.id) + - workshop_link = view_workshop_url(@workshop.conference.slug, @workshop.id) %a{href: workshop_link}=_!(workshop_link) From 2e74b9d427bc32f8173af7d00238940636d202d4 Mon Sep 17 00:00:00 2001 From: Godwin Date: Wed, 16 Aug 2017 09:58:59 -0700 Subject: [PATCH 2/3] Added missing translation for schedule page --- config/locales/en.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index b2cd482..e0fc616 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1173,6 +1173,8 @@ en: errors: format: "%{attribute} %{message}" messages: + schedule: + need_not_available: '%{workshop_title} workshop requires %{need} but %{location} does not have this amenity' accepted: must be accepted blank: can't be blank present: must be blank From 790204e3edc0f2c308e3453ad633eeb044271778 Mon Sep 17 00:00:00 2001 From: Godwin Date: Thu, 17 Aug 2017 07:09:54 -0700 Subject: [PATCH 3/3] Added guest email addresses to host review page --- app/views/registration_steps/_review.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/registration_steps/_review.html.haml b/app/views/registration_steps/_review.html.haml index 0d82808..feced7e 100644 --- a/app/views/registration_steps/_review.html.haml +++ b/app/views/registration_steps/_review.html.haml @@ -63,10 +63,11 @@ - guests.each do |guest| %tr %th=guest.user.name + %th=guest.user.email %th=guest.from %tr - if guest.housing_data['other'].present? - %td{colspan: 2, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale} + %td{colspan: 3, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale} = paragraph guest.housing_data['other'] = row do