From 2fdfc57c49678d284edaea1ff600eb74c404b191 Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 21 Sep 2015 19:24:52 -0700 Subject: [PATCH] Fix for workshop translation permissions --- app/controllers/conferences_controller.rb | 4 +- app/models/workshop.rb | 4 +- app/views/workshops/show.html.haml | 4 +- .../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 | 4 +- .../data/html_records/Create-workshop--.html | 2 +- ...-conferences.MyBikeBike.workshops.1-1.html | 5 - ...-conferences.MyBikeBike.workshops.1-2.html | 5 - ...-conferences.MyBikeBike.workshops.1-3.html | 5 - ...p--conferences.MyBikeBike.workshops.1.html | 5 - .../html_records/Edit-a-conference--.html | 2 +- ...nference--conferences.MyBikeBike.edit.html | 94 ++++++++++++++++++- .../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 | 14 +-- ...-conferences.MyBikeBike.workshops.1-1.html | 13 +-- ...-conferences.MyBikeBike.workshops.1-2.html | 13 +-- ...-conferences.MyBikeBike.workshops.1-3.html | 11 +-- ...-conferences.MyBikeBike.workshops.1-4.html | 13 +-- ...-conferences.MyBikeBike.workshops.1-5.html | 15 +-- ...ces.MyBikeBike.workshops.1.facilitate.html | 6 +- ...yBikeBike.workshops.1.facilitate.sent.html | 2 +- ...p--conferences.MyBikeBike.workshops.1.html | 4 +- ...orkshop--workshop_facilitator_request.html | 14 +-- ...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 +- .../data/html_records/View-stats--.html | 2 +- ...ats--conferences.MyBikeBike.stats.xls.html | 2 +- config/locales/data/translation-info.yml | 70 +------------- db/schema.rb | 15 ++- features/workshops.feature | 16 ++-- 53 files changed, 215 insertions(+), 219 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index c3adb71..450f87a 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -832,7 +832,7 @@ class ConferencesController < ApplicationController @workshop = Workshop.find_by_id_and_conference_id(params[:workshop_id], @this_conference.id) do_404 unless @workshop @can_edit = @workshop.can_edit?(current_user) - do_403 unless @can_edit || @workshop.can_translate?(current_user) + do_403 unless @can_edit || @workshop.can_translate?(current_user, I18n.locale) @title = @workshop.title @info = @workshop.info @needs = JSON.parse(@workshop.needs || '[]').map &:to_sym @@ -888,7 +888,7 @@ class ConferencesController < ApplicationController end can_edit = workshop.can_edit?(current_user) - do_403 unless can_edit || workshop.can_translate?(current_user) + do_403 unless can_edit || workshop.can_translate?(current_user, I18n.locale) workshop.title = params[:title] workshop.info = params[:info] diff --git a/app/models/workshop.rb b/app/models/workshop.rb index f76ee28..290c920 100644 --- a/app/models/workshop.rb +++ b/app/models/workshop.rb @@ -83,8 +83,8 @@ class Workshop < ActiveRecord::Base interested ? interested.size : 0 end - def can_translate?(user) - user.can_translate? || can_edit?(user) + def can_translate?(user, lang) + (user.can_translate? && lang.to_sym != locale.to_sym) || can_edit?(user) end private diff --git a/app/views/workshops/show.html.haml b/app/views/workshops/show.html.haml index 1046bc1..caec851 100644 --- a/app/views/workshops/show.html.haml +++ b/app/views/workshops/show.html.haml @@ -12,10 +12,10 @@ = form_tag toggle_workshop_interest_path(@this_conference.slug, @workshop.id) do = button_tag (@workshop.interested?(current_user) ? :remove_interest : :show_interest), :value => :toggle_interest, :class => (@workshop.interested?(current_user) ? 'delete' : 'add') =markdown _!(@workshop.info) || '' - - if @workshop.can_translate?(current_user) + - if current_user.can_translate? .actions - I18n.backend.enabled_locales.each do |locale| - = (link_to (_'actions.workshops.Translate', "Translate into #{language_name(locale)}", :vars => {:language => language_name(locale)}), edit_workshop_url(@this_conference.slug, @workshop.id, url_params(locale)), :class => 'button translate') if locale.to_sym != I18n.locale.to_sym + = (link_to (_'actions.workshops.Translate', "Translate into #{language_name(locale)}", :vars => {:language => language_name(locale)}), edit_workshop_url(@this_conference.slug, @workshop.id, url_params(locale)), :class => 'button translate') if @workshop.can_translate?(current_user, locale) = columns(medium: 6) do %h3=_'articles.workshops.headings.facilitators' .facilitators 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 79350b6..97a8d9b 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 20 – 24, 2015 +August 22 – 26, 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 a3d681a..75d25d4 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 @@
-

Morbi Odio Odio, Elementum Eu, Interdum Eu, Tincidunt In, Leo

+

Mauris Enim Leo, Rhoncus Sed, Vestibulum Sit Amet, Cursus Id, Turpis

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

Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.

+

Maecenas tristique, est et tempus semper, est quam pharetra magna, ac consequat metus sapien ut nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris viverra diam vitae quam. Suspendisse potenti.

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 0933a50..0e8807a 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 @@
-

Morbi Odio Odio, Elementum Eu, Interdum Eu, Tincidunt In, Leo

+

Mauris Enim Leo, Rhoncus Sed, Vestibulum Sit Amet, Cursus Id, Turpis

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

Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.

+

Maecenas tristique, est et tempus semper, est quam pharetra magna, ac consequat metus sapien ut nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris viverra diam vitae quam. Suspendisse potenti.

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 0933a50..0e8807a 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 @@
-

Morbi Odio Odio, Elementum Eu, Interdum Eu, Tincidunt In, Leo

+

Mauris Enim Leo, Rhoncus Sed, Vestibulum Sit Amet, Cursus Id, Turpis

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

Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.

+

Maecenas tristique, est et tempus semper, est quam pharetra magna, ac consequat metus sapien ut nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris viverra diam vitae quam. Suspendisse potenti.

Facilitators

diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html index 8490bf3..c4e65bc 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 20 – 24, 2015 +August 22 – 26, 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 56c2a0f..8b2df9a 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 @@ -78,7 +78,7 @@ @@ -93,7 +93,7 @@ diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html index 8490bf3..c4e65bc 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 20 – 24, 2015 +August 22 – 26, 2015
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html index 525d8ff..bf8e1cd 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -57,11 +57,6 @@

Lorem Ipsum

-
- -Translate into Spanish -Translate into French -

Facilitators

diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html index e990ffc..8c8319e 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -57,11 +57,6 @@

Lorem Ipsum

-
- -Translate into Spanish -Translate into French -

Facilitators

diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html index e990ffc..8c8319e 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html @@ -57,11 +57,6 @@

Lorem Ipsum

-
- -Translate into Spanish -Translate into French -

Facilitators

diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html index 525d8ff..bf8e1cd 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html @@ -57,11 +57,6 @@

Lorem Ipsum

-
- -Translate into Spanish -Translate into French -

Facilitators

diff --git a/config/locales/data/html_records/Edit-a-conference--.html b/config/locales/data/html_records/Edit-a-conference--.html index fcec57d..eb5ead3 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 20 – 24, 2015 +August 22 – 26, 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 a56fd27..d4169ac 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 @@ -57,7 +57,7 @@
- +

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

Type something
@@ -86,4 +86,94 @@ colors: ['#00ADEF', '#DD57EF', '#E6C74B', 'REMOVE'] }); }); -
\ 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 79350b6..97a8d9b 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 20 – 24, 2015 +August 22 – 26, 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 6549d6c..8ae08f6 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 @@
-

Cum Sociis Natoque Penatibus Et Magnis Dis Parturient Montes, Nascetur Ridiculus Mus

+

Duis At Velit Eu Est Congue Elementum

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

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.

+

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

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 08478c5..ed85329 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 @@
-

Cum Sociis Natoque Penatibus Et Magnis Dis Parturient Montes, Nascetur Ridiculus Mus

+

Duis At Velit Eu Est Congue Elementum

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

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.

+

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

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 08478c5..ed85329 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 @@
-

Cum Sociis Natoque Penatibus Et Magnis Dis Parturient Montes, Nascetur Ridiculus Mus

+

Duis At Velit Eu Est Congue Elementum

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

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.

+

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

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 79350b6..97a8d9b 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 20 – 24, 2015 +August 22 – 26, 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 79350b6..97a8d9b 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 20 – 24, 2015 +August 22 – 26, 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 0ae7f86..678bce0 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 @@
- +
-© 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-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 e48a67c..27ad452 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 74654c2..1bad3ed 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 28907d5..10d2e10 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 994609c..346cd14 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 Mauris Sit Amet Eros from John Doe</span> +<span class="translated-content" data-i18n-key="email.subject.workshop_facilitator_request" data-i18n-needs-translation="0">Request to facilitate Suspendisse Potenti 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 de2bf1b..f57f711 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,13 +55,8 @@
No one is interested in this workshop yet
-

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+

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

-
- -Translate into Spanish -Translate into French -

Facilitators

@@ -73,13 +68,13 @@
Joey
-collaborator +Collaborator
Katie
-requested +Requested Approve Deny
@@ -87,7 +82,7 @@
Jim
-requested +Requested Approve Deny
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 e5a01dc..9cf4c62 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,13 +55,8 @@
No one is interested in this workshop yet
-

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+

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

-
- -Translate into Spanish -Translate into French -

Facilitators

@@ -73,13 +68,13 @@
Joey
-collaborator +Collaborator
Katie
-requested +Requested Approve Deny
@@ -87,7 +82,7 @@
Jim
-collaborator +Collaborator
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 b5327b3..2f76e00 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,13 +55,8 @@
No one is interested in this workshop yet
-

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+

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

-
- -Translate into Spanish -Translate into French -

Facilitators

@@ -73,13 +68,13 @@
Joey
-collaborator +Collaborator
Jim
-collaborator +Collaborator
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 603d1c0..c3f724c 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,13 +55,8 @@
No one is interested in this workshop yet
-

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+

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

-
- -Translate into Spanish -Translate into French -

Facilitators

@@ -73,19 +68,19 @@
Joey
-collaborator +Collaborator
Jim
-collaborator +Collaborator
Ricardo
-collaborator +Collaborator
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 92528ed..d80dbef 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,13 +55,8 @@
No one is interested in this workshop yet
-

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus vestibulum sagittis sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+

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

-
- -Translate into Spanish -Translate into French -

Facilitators

@@ -73,25 +68,25 @@
Joey
-collaborator +Collaborator
Jim
-collaborator +Collaborator
Ricardo
-collaborator +Collaborator
nicky@bikebike.org
-unregistered +Unregistered Remove
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 9fbc469..34b3b19 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 @@ -40,7 +40,7 @@
-

Facilitate Workshop

+

Workshop Facilitation Request

@@ -53,11 +53,11 @@
-

Request to Facilitate ‘Mauris Sit Amet Eros’

+

Request to Facilitate ‘Suspendisse Potenti’

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.facilitate.sent.html b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.sent.html index ca2c513..353f532 100644 --- a/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.sent.html +++ b/config/locales/data/html_records/Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1.facilitate.sent.html @@ -40,7 +40,7 @@
-

Facilitate Workshop

+

Workshop Facilitation Request

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 45b673b..640add3 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 @@
-

Mauris Sit Amet Eros

+

Suspendisse Potenti

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

In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet.

+

Cras non velit nec nisi vulputate nonummy. Maecenas tincidunt lacus at velit. Vivamus vel nulla eget eros elementum pellentesque.

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 994609c..346cd14 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 Mauris Sit Amet Eros from John Doe</span> +<span class="translated-content" data-i18n-key="email.subject.workshop_facilitator_request" data-i18n-needs-translation="0">Request to facilitate Suspendisse Potenti from John Doe</span> - +

Below is a message from John Doe:

+

John Doe has requested to help facilitate Suspendisse Potenti:

Please let me join

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

-

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

+

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 74654c2..1bad3ed 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 @@

Below is a message from John Doe:

+

John Doe has requested to help facilitate Suspendisse Potenti:

Please let me join

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

-

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

+

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 28907d5..10d2e10 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 0ae7f86..678bce0 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 e48a67c..27ad452 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 1a60bfb..818aa6c 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 20 – 24, 2015 +August 22 – 26, 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 5a450e5..c4ff70b 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 20 – 24, 2015 +August 22 – 26, 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 388e38b..6bce666 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 20 – 24, 2015 +August 22 – 26, 2015
@@ -62,7 +62,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

My Awesome Workshop

-

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

+

Maecenas leo odio, condimentum id, luctus nec, molestie sed, justo. Pellentesque viverra pede ac diam. Cras pellentesque volutpat dui.

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 7ce5ac2..d0cc740 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 fef8545..f691980 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 296f1df..a2042e2 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 7ce5ac2..d0cc740 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 fef8545..f691980 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-stats--.html b/config/locales/data/html_records/View-stats--.html index 66414e9..2a4f225 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 20 – 24, 2015 +August 22 – 26, 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 518de25..e8315b3 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 f61e157..10e868c 100644 --- a/config/locales/data/translation-info.yml +++ b/config/locales/data/translation-info.yml @@ -933,10 +933,6 @@ languages.es: - Create-workshop--conferences.MyBikeBike.workshops.create - Create-workshop--conferences.MyBikeBike.workshops.1 - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1-1 - - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1.edit @@ -944,10 +940,6 @@ languages.es: - Create-workshop--conferences.MyBikeBike.workshops.1.edit - Create-workshop--conferences.MyBikeBike.workshops.1-2 - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-3 - - Create-workshop--conferences.MyBikeBike.workshops.1-3 - Create-workshop--conferences.MyBikeBike.workshops.1-3 - Create-workshop--conferences.MyBikeBike.workshops.1-3 - Create-workshop--conferences.MyBikeBike.workshops.1.delete @@ -990,22 +982,12 @@ languages.es: - Request-to-facilitate-a-workshop---1 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 context: Spanish @@ -1100,10 +1082,6 @@ languages.fr: - Create-workshop--conferences.MyBikeBike.workshops.create - Create-workshop--conferences.MyBikeBike.workshops.1 - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1-1 - - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1.edit @@ -1111,10 +1089,6 @@ languages.fr: - Create-workshop--conferences.MyBikeBike.workshops.1.edit - Create-workshop--conferences.MyBikeBike.workshops.1-2 - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-3 - - Create-workshop--conferences.MyBikeBike.workshops.1-3 - Create-workshop--conferences.MyBikeBike.workshops.1-3 - Create-workshop--conferences.MyBikeBike.workshops.1-3 - Create-workshop--conferences.MyBikeBike.workshops.1.delete @@ -1157,24 +1131,14 @@ languages.fr: - Request-to-facilitate-a-workshop---1 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 context: French links.footer.help_text.contributors: pages: @@ -2717,32 +2681,6 @@ articles.workshops.info.interested_count: - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 -actions.workshops.Translate: - pages: - - "/conferences/:slug/workshops/:workshop_id" - context: Translate into Spanish - vars: - - :language - examples: - - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1 - - Create-workshop--conferences.MyBikeBike.workshops.1-1 - - Create-workshop--conferences.MyBikeBike.workshops.1-1 - - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-2 - - Create-workshop--conferences.MyBikeBike.workshops.1-3 - - Create-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-1 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-2 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-3 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-4 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 - - Request-to-facilitate-a-workshop--conferences.MyBikeBike.workshops.1-5 articles.workshops.headings.facilitators: pages: - "/conferences/:slug/workshops/:workshop_id" @@ -2904,7 +2842,7 @@ page_titles.conferences.Facilitate_Workshop: articles.workshops.headings.facilitate: pages: - "/conferences/:slug/workshops/:workshop_id/facilitate" - context: Request to Facilitate ‘Mauris Sit Amet Eros’ + context: Request to Facilitate ‘Suspendisse Potenti’ vars: - :workshop_title examples: @@ -2927,7 +2865,7 @@ forms.labels.generic.message: email.subject.workshop_facilitator_request: pages: - "/conferences/:slug/workshops/:workshop_id/facilitate_request" - context: Request to facilitate Mauris Sit Amet Eros from John Doe + context: Request to facilitate Suspendisse Potenti from John Doe vars: - :workshop_title - :requester_name @@ -3025,7 +2963,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 @@ -3047,7 +2985,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: diff --git a/db/schema.rb b/db/schema.rb index 621d3f3..c0efcd0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150914230507) do +ActiveRecord::Schema.define(version: 20150920233755) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -157,6 +157,17 @@ ActiveRecord::Schema.define(version: 20150914230507) do t.datetime "updated_at", null: false end + create_table "event_locations", force: :cascade do |t| + t.string "title" + t.integer "conference_id" + t.float "latitude" + t.float "longitude" + t.string "address" + t.string "amenities" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "event_types", force: :cascade do |t| t.string "slug" t.text "info" @@ -175,6 +186,7 @@ ActiveRecord::Schema.define(version: 20150914230507) do t.datetime "end_time" t.datetime "created_at" t.datetime "updated_at" + t.integer "event_location_id" end create_table "locations", force: :cascade do |t| @@ -387,6 +399,7 @@ ActiveRecord::Schema.define(version: 20150914230507) do t.text "host_info" t.text "notes" t.string "locale" + t.integer "event_location_id" end end diff --git a/features/workshops.feature b/features/workshops.feature index 6daffde..de8e23e 100644 --- a/features/workshops.feature +++ b/features/workshops.feature @@ -113,22 +113,22 @@ Feature: Workshop Page And Ricardo is registered for the conference And I view the workshop - Then I should see Joey collaborator - And I should see Katie requested - And I should see Jim requested + Then I should see Joey Collaborator + And I should see Katie Requested + And I should see Jim Requested Then I approve the facilitator request from Jim - And I should see Jim collaborator - And I should see Katie requested + And I should see Jim Collaborator + And I should see Katie Requested Then I deny the facilitator request from Katie - And I should see Jim collaborator + And I should see Jim Collaborator And I should not see Katie And I fill in email with ricky@bikebike.org And I click the + button - Then I should see Ricardo collaborator + Then I should see Ricardo Collaborator And I fill in email with nicky@bikebike.org And I click the + button - Then I should see nicky@bikebike.org unregistered + Then I should see nicky@bikebike.org Unregistered

-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
Jeff someguy@bikebike.org Somewhere2015-09-19 22:20:042015-09-22 02:21:25 English 2015-09-28 00:00:00 2015-09-28 00:00:00