From dfd39d77e0a72fb0caaf476fdc69e333f78eaf5d Mon Sep 17 00:00:00 2001 From: Godwin Date: Tue, 29 Sep 2015 22:31:22 -0700 Subject: [PATCH] Allowing registration to be access but not modified after registration is closed --- app/controllers/conferences_controller.rb | 17 ++- app/views/conferences/_done.html.haml | 7 +- .../workshops/_workshop_previews.html.haml | 2 +- app/views/workshops/index.html.haml | 2 +- .../Be-the-first-to-like-a-workshop--.html | 2 +- ...-conferences.MyBikeBike.workshops.1-1.html | 4 +- ...-conferences.MyBikeBike.workshops.1-2.html | 4 +- ...p--conferences.MyBikeBike.workshops.1.html | 4 +- .../html_records/Broadcast-message--.html | 2 +- ...age--conferences.MyBikeBike.broadcast.html | 2 +- .../data/html_records/Create-workshop--.html | 2 +- .../html_records/Edit-a-conference--.html | 2 +- ...nference--conferences.MyBikeBike.edit.html | 108 +----------------- .../data/html_records/Like-a-workshop--.html | 2 +- ...-conferences.MyBikeBike.workshops.1-1.html | 4 +- ...-conferences.MyBikeBike.workshops.1-2.html | 4 +- ...p--conferences.MyBikeBike.workshops.1.html | 4 +- .../Request-to-facilitate-a-workshop---1.html | 2 +- .../Request-to-facilitate-a-workshop--.html | 2 +- ...-conferences.MyBikeBike.workshops.1-1.html | 4 +- ...-conferences.MyBikeBike.workshops.1-2.html | 4 +- ...-conferences.MyBikeBike.workshops.1-3.html | 4 +- ...-conferences.MyBikeBike.workshops.1-4.html | 4 +- ...ces.MyBikeBike.workshops.1.facilitate.html | 10 +- ...-conferences.MyBikeBike.workshops.1-1.html | 2 +- ...-conferences.MyBikeBike.workshops.1-2.html | 2 +- ...-conferences.MyBikeBike.workshops.1-3.html | 2 +- ...-conferences.MyBikeBike.workshops.1-4.html | 2 +- ...-conferences.MyBikeBike.workshops.1-5.html | 2 +- ...ces.MyBikeBike.workshops.1.facilitate.html | 2 +- ...p--conferences.MyBikeBike.workshops.1.html | 4 +- ...orkshop--workshop_facilitator_request.html | 10 +- ...rkshop_facilitator_request_approved-1.html | 4 +- ...rkshop_facilitator_request_approved-2.html | 4 +- ...workshop_facilitator_request_approved.html | 4 +- ...--workshop_facilitator_request_denied.html | 4 +- .../html_records/See-a-more-info-link--.html | 2 +- .../html_records/See-a-register-link--.html | 2 +- ...tart-registration-from-landing-page--.html | 4 +- ...ge--conferences.MyBikeBike.register-1.html | 4 +- ...ge--conferences.MyBikeBike.register-3.html | 2 +- ...ge--conferences.MyBikeBike.register-3.html | 4 +- ...from-landing-page--email_confirmation.html | 4 +- ...nding-page--registration_confirmation.html | 2 +- .../View-published-schedule--.html | 10 +- .../data/html_records/View-stats--.html | 2 +- ...ats--conferences.MyBikeBike.stats.xls.html | 2 +- config/locales/data/translation-info.yml | 25 +++- 48 files changed, 113 insertions(+), 194 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index fe2a31e..4b9f8a1 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -517,16 +517,20 @@ class ConferencesController < ApplicationController is_post = request.post? || session[:registration_step] set_conference - if !@this_conference.registration_open - do_404 - return - end + #if !@this_conference.registration_open + # do_404 + # return + #end set_conference_registration @register_template = nil if logged_in? + unless @this_conference.registration_open || @registration + do_404 + return + end # if the user is logged in start them off on the policy # page, unless they have already begun registration then # start them off with questions @@ -650,6 +654,11 @@ class ConferencesController < ApplicationController @register_template = :done end + # don't let the user edit registration if registration is closed + if !@conference.registration_open && @register_template == :questions + @register_template = :done + end + # prepare data for the next view case @register_template when :questions diff --git a/app/views/conferences/_done.html.haml b/app/views/conferences/_done.html.haml index b8e7049..0bfc565 100644 --- a/app/views/conferences/_done.html.haml +++ b/app/views/conferences/_done.html.haml @@ -45,6 +45,7 @@ %tr %th=_'articles.conference_registration.headings.payment' %td=_!('$' + (@amount || 0)) - = form_tag register_path(@this_conference.slug) do - .actions - = button_tag :edit_registration, :value => :register + - if @conference.registration_open + = form_tag register_path(@this_conference.slug) do + .actions + = button_tag :edit_registration, :value => :register diff --git a/app/views/workshops/_workshop_previews.html.haml b/app/views/workshops/_workshop_previews.html.haml index cdcea25..19bc81b 100644 --- a/app/views/workshops/_workshop_previews.html.haml +++ b/app/views/workshops/_workshop_previews.html.haml @@ -1,6 +1,6 @@ - # encoding: utf-8 %ul.workshop-previews - - workshops.each do |w| + - workshops.sort_by{ |w| w.title.downcase }.each do |w| - if w.title %li =link_to view_workshop_path(@this_conference.slug, w.id) do diff --git a/app/views/workshops/index.html.haml b/app/views/workshops/index.html.haml index ca3c646..a07e26d 100644 --- a/app/views/workshops/index.html.haml +++ b/app/views/workshops/index.html.haml @@ -8,6 +8,6 @@ = columns(medium: 6) do %h3=_'articles.workshops.headings.Your_Workshops' = render 'workshops/workshop_previews', :workshops => @my_workshops - = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify] + = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify] if @conference.registration_open = row do = render 'workshops/workshop_previews', :workshops => @workshops \ No newline at end of file diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html index 052f244..bf81aa8 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html @@ -46,7 +46,7 @@

Guadalajara, Jalisco, Mexico

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html index e0e18be..a9d0dd1 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -51,7 +51,7 @@
-

Sed Accumsan Felis

+

Cras Mi Pede, Malesuada In, Imperdiet Et, Commodo Vulputate, Justo

You are interested in this workshop
@@ -59,7 +59,7 @@
-

Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.

+

Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.

Facilitators

diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html index 5c2caea..36b2e60 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -51,7 +51,7 @@
-

Sed Accumsan Felis

+

Cras Mi Pede, Malesuada In, Imperdiet Et, Commodo Vulputate, Justo

No one is interested in this workshop yet
@@ -59,7 +59,7 @@
-

Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.

+

Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.

Facilitators

diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html index 5c2caea..36b2e60 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html @@ -51,7 +51,7 @@
-

Sed Accumsan Felis

+

Cras Mi Pede, Malesuada In, Imperdiet Et, Commodo Vulputate, Justo

No one is interested in this workshop yet
@@ -59,7 +59,7 @@
-

Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.

+

Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.

Facilitators

diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html index e4ad3d8..288fd3a 100644 --- a/config/locales/data/html_records/Broadcast-message--.html +++ b/config/locales/data/html_records/Broadcast-message--.html @@ -46,7 +46,7 @@

San Marcos, Texas

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html index d8d6f73..79ed8e2 100644 --- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html +++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html @@ -89,7 +89,7 @@ -© Bike!Bike! 2015 +© Bike!Bike! 2015 diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html index e4ad3d8..288fd3a 100644 --- a/config/locales/data/html_records/Create-workshop--.html +++ b/config/locales/data/html_records/Create-workshop--.html @@ -46,7 +46,7 @@

San Marcos, Texas

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Edit-a-conference--.html b/config/locales/data/html_records/Edit-a-conference--.html index 1eb3f6a..7865a7a 100644 --- a/config/locales/data/html_records/Edit-a-conference--.html +++ b/config/locales/data/html_records/Edit-a-conference--.html @@ -46,7 +46,7 @@

Portland, Oregon

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html index 7a17e06..0954f5c 100644 --- a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html +++ b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html @@ -58,7 +58,7 @@
-

Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

Type something
+
@@ -73,108 +73,4 @@
- - - - -
- - - - - - - \ No newline at end of file +
\ No newline at end of file diff --git a/config/locales/data/html_records/Like-a-workshop--.html b/config/locales/data/html_records/Like-a-workshop--.html index 052f244..bf81aa8 100644 --- a/config/locales/data/html_records/Like-a-workshop--.html +++ b/config/locales/data/html_records/Like-a-workshop--.html @@ -46,7 +46,7 @@

Guadalajara, Jalisco, Mexico

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html index 13328c4..2723b83 100644 --- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -51,7 +51,7 @@
-

Etiam Justo

+

Lorem Ipsum Dolor Sit Amet, Consectetuer Adipiscing Elit

You and 4 others are interested in this workshop
@@ -59,7 +59,7 @@
-

Fusce consequat. Nulla nisl. Nunc nisl.

+

Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.

Facilitators

diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html index e8d5fce..3a82e6a 100644 --- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -51,7 +51,7 @@
-

Etiam Justo

+

Lorem Ipsum Dolor Sit Amet, Consectetuer Adipiscing Elit

4 people are interested in this workshop
@@ -59,7 +59,7 @@
-

Fusce consequat. Nulla nisl. Nunc nisl.

+

Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.

Facilitators

diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html index e8d5fce..3a82e6a 100644 --- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html +++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html @@ -51,7 +51,7 @@
-

Etiam Justo

+

Lorem Ipsum Dolor Sit Amet, Consectetuer Adipiscing Elit

4 people are interested in this workshop
@@ -59,7 +59,7 @@
-

Fusce consequat. Nulla nisl. Nunc nisl.

+

Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop---1.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop---1.html index 052f244..bf81aa8 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop---1.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop---1.html @@ -46,7 +46,7 @@

Guadalajara, Jalisco, Mexico

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--.html index 052f244..bf81aa8 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--.html @@ -46,7 +46,7 @@

Guadalajara, Jalisco, Mexico

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html index 8ce4071..0f562bf 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -78,7 +78,7 @@ @@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html index b253fc9..a20aa91 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -78,7 +78,7 @@

-You have been added as a facilitator of My Awesome Workshop. +You have been added as a facilitator of My Awesome Workshop.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html index 5442142..12eb7b7 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html @@ -78,7 +78,7 @@

-Your request to become a facilitator of My Awesome Workshop has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate. +Your request to become a facilitator of My Awesome Workshop has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html index 00aa8da..016de70 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html @@ -78,7 +78,7 @@

-You have been added as a facilitator of My Awesome Workshop. +You have been added as a facilitator of My Awesome Workshop.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html index d6ece93..326db56 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html @@ -3,7 +3,7 @@ -<span class="translated-content" data-i18n-key="email.subject.workshop_facilitator_request" data-i18n-needs-translation="0">Request to facilitate In Eleifend Quam A Odio from John Doe</span> +<span class="translated-content" data-i18n-key="email.subject.workshop_facilitator_request" data-i18n-needs-translation="0">Request to facilitate Vestibulum Sed Magna At Nunc Commodo Placerat from John Doe</span> - +

-You have been added as a facilitator of My Awesome Workshop. +You have been added as a facilitator of My Awesome Workshop.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
- @@ -95,7 +95,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html index 86f7f11..551e155 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -55,7 +55,7 @@
No one is interested in this workshop yet
-

Phasellus in felis. Donec semper sapien a libero. Nam dui.

+

Quisque id justo sit amet sapien dignissim vestibulum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla dapibus dolor vel est. Donec odio justo, sollicitudin ut, suscipit a, feugiat et, eros.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html index 417378f..4439749 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -55,7 +55,7 @@
No one is interested in this workshop yet
-

Phasellus in felis. Donec semper sapien a libero. Nam dui.

+

Quisque id justo sit amet sapien dignissim vestibulum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla dapibus dolor vel est. Donec odio justo, sollicitudin ut, suscipit a, feugiat et, eros.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html index 2538ea1..071f450 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3.html @@ -55,7 +55,7 @@
No one is interested in this workshop yet
-

Phasellus in felis. Donec semper sapien a libero. Nam dui.

+

Quisque id justo sit amet sapien dignissim vestibulum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla dapibus dolor vel est. Donec odio justo, sollicitudin ut, suscipit a, feugiat et, eros.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html index baf5361..f950da7 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4.html @@ -55,7 +55,7 @@
No one is interested in this workshop yet
-

Phasellus in felis. Donec semper sapien a libero. Nam dui.

+

Quisque id justo sit amet sapien dignissim vestibulum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla dapibus dolor vel est. Donec odio justo, sollicitudin ut, suscipit a, feugiat et, eros.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5.html index f938638..3acdeb3 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5.html @@ -55,7 +55,7 @@
No one is interested in this workshop yet
-

Phasellus in felis. Donec semper sapien a libero. Nam dui.

+

Quisque id justo sit amet sapien dignissim vestibulum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla dapibus dolor vel est. Donec odio justo, sollicitudin ut, suscipit a, feugiat et, eros.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html index b5fa7bf..ce95bc2 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.html @@ -53,7 +53,7 @@
-

Request to Facilitate ‘In Eleifend Quam A Odio’

+

Request to Facilitate ‘Vestibulum Sed Magna At Nunc Commodo Placerat’

Please tell the current workshop facilitators who you are, why you want to help facilitate the workshop, and how you think you will help make the workshop better. All of the current facilitators will be emailed and they may ask more questions before approving or denying your request. Please note that this will reveal your email address to the facilitators.

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.html index 2e6fc24..31a51af 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.html @@ -51,7 +51,7 @@
-

In Eleifend Quam A Odio

+

Vestibulum Sed Magna At Nunc Commodo Placerat

No one is interested in this workshop yet @@ -59,7 +59,7 @@
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Proin risus. Praesent lectus.

+

Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.

Facilitators

diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request.html index d6ece93..326db56 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request.html @@ -3,7 +3,7 @@ -<span class="translated-content" data-i18n-key="email.subject.workshop_facilitator_request" data-i18n-needs-translation="0">Request to facilitate In Eleifend Quam A Odio from John Doe</span> +<span class="translated-content" data-i18n-key="email.subject.workshop_facilitator_request" data-i18n-needs-translation="0">Request to facilitate Vestibulum Sed Magna At Nunc Commodo Placerat from John Doe</span> - +

John Doe has requested to help facilitate In Eleifend Quam A Odio:

+

John Doe has requested to help facilitate Vestibulum Sed Magna At Nunc Commodo Placerat:

Please let me join

You can approve or deny this request on your workshop page: -http://127.0.0.1:57139/conferences/MyBikeBike/workshops/1 +http://127.0.0.1:51906/conferences/MyBikeBike/workshops/1

You can also reply directly to this email to ask follow-up questions.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
- @@ -95,7 +95,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-1.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-1.html index 5442142..12eb7b7 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-1.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-1.html @@ -78,7 +78,7 @@

John Doe has requested to help facilitate In Eleifend Quam A Odio:

+

John Doe has requested to help facilitate Vestibulum Sed Magna At Nunc Commodo Placerat:

Please let me join

You can approve or deny this request on your workshop page: -http://127.0.0.1:57139/conferences/MyBikeBike/workshops/1 +http://127.0.0.1:51906/conferences/MyBikeBike/workshops/1

You can also reply directly to this email to ask follow-up questions.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-2.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-2.html index 00aa8da..016de70 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-2.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved-2.html @@ -78,7 +78,7 @@

-You have been added as a facilitator of My Awesome Workshop. +You have been added as a facilitator of My Awesome Workshop.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved.html index 8ce4071..0f562bf 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_approved.html @@ -78,7 +78,7 @@

-You have been added as a facilitator of My Awesome Workshop. +You have been added as a facilitator of My Awesome Workshop.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_denied.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_denied.html index b253fc9..a20aa91 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_denied.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--workshop_facilitator_request_denied.html @@ -78,7 +78,7 @@

-You have been added as a facilitator of My Awesome Workshop. +You have been added as a facilitator of My Awesome Workshop.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/See-a-more-info-link--.html b/config/locales/data/html_records/See-a-more-info-link--.html index 5e2573c..24b5ff2 100644 --- a/config/locales/data/html_records/See-a-more-info-link--.html +++ b/config/locales/data/html_records/See-a-more-info-link--.html @@ -50,7 +50,7 @@

Halifax, Nova Scotia

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/See-a-register-link--.html b/config/locales/data/html_records/See-a-register-link--.html index d66dce3..47fbccd 100644 --- a/config/locales/data/html_records/See-a-register-link--.html +++ b/config/locales/data/html_records/See-a-register-link--.html @@ -41,7 +41,7 @@

Sackville, New Brunswick

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--.html b/config/locales/data/html_records/Start-registration-from-landing-page--.html index da8109b..3a45a03 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--.html @@ -41,7 +41,7 @@

Halifax, Nova Scotia

-August 27 – 31, 2015 +August 30 – September 3, 2015
@@ -62,7 +62,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

My Awesome Workshop

-

Mauris enim leo, rhoncus sed, vestibulum sit amet, cursus id, turpis. Integer aliquet, massa id lobortis convallis, tortor risus dapibus augue, vel accumsan tellus nisi eu orci. Mauris lacinia sapien quis libero.

+

Donec diam neque, vestibulum eget, vulputate ut, ultrices vel, augue. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec pharetra, magna vestibulum aliquet ultrices, erat tortor sollicitudin mi, sit amet lobortis sapien sapien non mi. Integer ac neque.

diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html index 1f6ed42..028559a 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html @@ -81,7 +81,7 @@

-Confirm now +Confirm now

@@ -95,7 +95,7 @@
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html index ab88be6..9477d49 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html @@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html index 0d4d18a..5ec29f3 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html @@ -67,8 +67,8 @@
- - + +

Which languages do you speak?

diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html index 1f6ed42..028559a 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html @@ -81,7 +81,7 @@

-Confirm now +Confirm now

@@ -95,7 +95,7 @@ diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html index ab88be6..9477d49 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html @@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/View-published-schedule--.html b/config/locales/data/html_records/View-published-schedule--.html index 6df4a1b..922dead 100644 --- a/config/locales/data/html_records/View-published-schedule--.html +++ b/config/locales/data/html_records/View-published-schedule--.html @@ -41,7 +41,7 @@

Boise, Idaho

-August 27 – 31, 2015 +August 30 – September 3, 2015
@@ -58,7 +58,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

Schedule

-

Friday

+

Monday

morning

-Your request to become a facilitator of My Awesome Workshop has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate. +Your request to become a facilitator of My Awesome Workshop has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.

-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
@@ -78,7 +78,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.
No one is interested in this workshop yet
-

Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.

+

Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.

Facilitators

@@ -109,7 +109,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.
No one is interested in this workshop yet
-

In hac habitasse platea dictumst. Etiam faucibus cursus urna. Ut tellus.

+

Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus.

Facilitators

@@ -140,7 +140,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.
No one is interested in this workshop yet
-

Duis bibendum. Morbi non quam nec dui luctus rutrum. Nulla tellus.

+

Pellentesque at nulla. Suspendisse potenti. Cras in purus eu magna vulputate luctus.

Facilitators

diff --git a/config/locales/data/html_records/View-stats--.html b/config/locales/data/html_records/View-stats--.html index 415d0b9..6fb6dd5 100644 --- a/config/locales/data/html_records/View-stats--.html +++ b/config/locales/data/html_records/View-stats--.html @@ -46,7 +46,7 @@

Anchorage, Alaska

-August 27 – 31, 2015 +August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html index 5d57364..de6a530 100644 --- a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html +++ b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html @@ -28,7 +28,7 @@ Excel Spreadsheet
- + diff --git a/config/locales/data/translation-info.yml b/config/locales/data/translation-info.yml index 9c9224f..03b8b36 100644 --- a/config/locales/data/translation-info.yml +++ b/config/locales/data/translation-info.yml @@ -5,7 +5,7 @@ geography.subregions.CA.NS: examples: - See-a-more-info-link-- - Start-registration-from-landing-page-- -date.formats.span_same_month_date_1: +date.formats.span_same_year_date_1: pages: - "/" examples: @@ -27,20 +27,32 @@ date.month_names: - "/conferences/:slug/register" examples: - See-a-more-info-link-- + - See-a-more-info-link-- + - See-a-register-link-- - See-a-register-link-- - Start-registration-from-landing-page-- + - Start-registration-from-landing-page-- - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 - View-stats-- + - View-stats-- + - Broadcast-message-- - Broadcast-message-- - Edit-a-conference-- + - Edit-a-conference-- - View-published-schedule-- + - View-published-schedule-- + - Create-workshop-- - Create-workshop-- - Be-the-first-to-like-a-workshop-- + - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- + - Like-a-workshop-- + - Request-to-facilitate-a-workshop-- - Request-to-facilitate-a-workshop-- - Request-to-facilitate-a-workshop---1 -date.formats.span_same_month_date_2: + - Request-to-facilitate-a-workshop---1 +date.formats.span_same_year_date_2: pages: - "/" examples: @@ -2938,7 +2950,7 @@ page_titles.conferences.Facilitate_Workshop: articles.workshops.headings.facilitate: pages: - "/conferences/:slug/workshops/:workshop_id/facilitate" - context: Request to Facilitate ‘In Eleifend Quam A Odio’ + context: Request to Facilitate ‘Vestibulum Sed Magna At Nunc Commodo Placerat’ vars: - :workshop_title examples: @@ -2961,7 +2973,8 @@ forms.labels.generic.message: email.subject.workshop_facilitator_request: pages: - "/conferences/:slug/workshops/:workshop_id/facilitate_request" - context: Request to facilitate In Eleifend Quam A Odio from John Doe + context: Request to facilitate Vestibulum Sed Magna At Nunc Commodo Placerat from + John Doe vars: - :workshop_title - :requester_name @@ -3059,7 +3072,7 @@ email.workshop.paragraph.request_approved: pages: - "/conferences/:slug/workshops/:workshop_id/facilitate_request/:user_id/:approve_or_deny" - "/conferences/:slug/workshops/:workshop_id/add_facilitator" - context: You have been added as a facilitator of My + context: You have been added as a facilitator of My Awesome Workshop. vars: - :workshop_title @@ -3081,7 +3094,7 @@ email.subject.workshop_request_denied: email.workshop.paragraph.request_denied: pages: - "/conferences/:slug/workshops/:workshop_id/facilitate_request/:user_id/:approve_or_deny" - context: Your request to become a facilitator of My + context: Your request to become a facilitator of My Awesome Workshop has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate. vars:
Jeff someguy@bikebike.org Somewhere2015-09-27 03:02:262015-09-30 05:24:11 English 2015-09-28 00:00:00 2015-09-28 00:00:00