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

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."
-	
+	

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}
 

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}

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

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)

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