bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/bikebike/BikeBike into development

Browse Source
This commit is contained in:
Godwin 2017-08-17 07:10:04 -07:00
commit 2f9ec913fc
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/user_mailer/workshop_facilitator_request.html.haml
View File

@ -4,8 +4,8 @@
%p %p
=_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: " =_'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) %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." %p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions."

2
app/views/user_mailer/workshop_facilitator_request_approved.html.haml
View File

@ -1,4 +1,4 @@
%p %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} =_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link.html_safe}.", vars: {workshop_title: workshop_link.html_safe}

2
app/views/user_mailer/workshop_facilitator_request_denied.html.haml
View File

@ -1,3 +1,3 @@
%p %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} =_'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}

2
app/views/user_mailer/workshop_original_content_changed.html.haml
View File

@ -10,5 +10,5 @@
%p %p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: " =_'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 %a{href: workshop_link}=workshop_link

2
app/views/user_mailer/workshop_translated.html.haml
View File

@ -10,5 +10,5 @@
%p %p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: " =_'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) %a{href: workshop_link}=_!(workshop_link)

2
config/locales/en.yml
View File

@ -1173,6 +1173,8 @@ en:
errors: errors:
format: "%{attribute} %{message}" format: "%{attribute} %{message}"
messages: messages:
schedule:
need_not_available: '%{workshop_title} workshop requires %{need} but %{location} does not have this amenity'
accepted: must be accepted accepted: must be accepted
blank: can't be blank blank: can't be blank
present: must be blank present: must be blank