From 01d8679c9dc07325a9f5a1947c9745170e6d6bfc Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 14 Sep 2015 21:16:22 -0700 Subject: [PATCH] Added localization to workshops, made login persist through subdomains --- Gemfile | 2 +- Gemfile.lock | 62 +-- app/assets/stylesheets/_application.scss | 17 + app/controllers/conferences_controller.rb | 34 +- app/models/workshop.rb | 6 + app/views/conferences/edit.html.haml | 4 + app/views/shared/_footer.html.haml | 2 +- app/views/shared/_navbar.html.haml | 4 +- app/views/workshops/new.html.haml | 95 +++-- app/views/workshops/show.html.haml | 3 + config/initializers/session_store.rb | 2 +- .../Be-the-first-to-like-a-workshop--.html | 16 +- ...-conferences.MyBikeBike.workshops.1-1.html | 16 +- ...-conferences.MyBikeBike.workshops.1-2.html | 16 +- ...p--conferences.MyBikeBike.workshops.1.html | 16 +- ...irst-to-like-a-workshop--confirm.test.html | 14 +- .../html_records/Broadcast-message--.html | 16 +- ...e--conferences.MyBikeBike.broadcast-1.html | 14 +- ...e--conferences.MyBikeBike.broadcast-2.html | 14 +- ...e--conferences.MyBikeBike.broadcast-3.html | 14 +- ...age--conferences.MyBikeBike.broadcast.html | 4 +- .../Broadcast-message--confirm.test.html | 14 +- .../data/html_records/Create-workshop--.html | 16 +- ...shop--conferences.MyBikeBike.register.html | 14 +- ...p--conferences.MyBikeBike.workshops-1.html | 14 +- ...-conferences.MyBikeBike.workshops.1-1.html | 17 +- ...-conferences.MyBikeBike.workshops.1-2.html | 17 +- ...-conferences.MyBikeBike.workshops.1-3.html | 17 +- ...erences.MyBikeBike.workshops.1.delete.html | 14 +- ...nferences.MyBikeBike.workshops.1.edit.html | 14 +- ...p--conferences.MyBikeBike.workshops.1.html | 17 +- ...nferences.MyBikeBike.workshops.create.html | 14 +- ...hop--conferences.MyBikeBike.workshops.html | 14 +- .../Create-workshop--confirm.test.html | 14 +- .../html_records/Edit-a-conference--.html | 157 +++++++ ...nference--conferences.MyBikeBike.edit.html | 75 ++++ .../Edit-a-conference--confirm.test.html | 159 ++++++++ .../data/html_records/Like-a-workshop--.html | 16 +- ...-conferences.MyBikeBike.workshops.1-1.html | 18 +- ...-conferences.MyBikeBike.workshops.1-2.html | 18 +- ...p--conferences.MyBikeBike.workshops.1.html | 18 +- .../Like-a-workshop--confirm.test.html | 14 +- .../Read-the-about-page--about.html | 14 +- .../Read-the-policy-page--policy.html | 14 +- .../See-a-404-page--error_404.html | 14 +- .../html_records/See-a-more-info-link--.html | 16 +- .../html_records/See-a-register-link--.html | 16 +- ...tart-registration-from-landing-page--.html | 18 +- ...ge--conferences.MyBikeBike.register-1.html | 4 +- ...ge--conferences.MyBikeBike.register-3.html | 2 +- ...ge--conferences.MyBikeBike.register-2.html | 14 +- ...ge--conferences.MyBikeBike.register-4.html | 14 +- ...ge--conferences.MyBikeBike.register-5.html | 14 +- ...ge--conferences.MyBikeBike.register-6.html | 14 +- ...page--conferences.MyBikeBike.register.html | 14 +- ...ikeBike.register.paypal_confirm.token.html | 14 +- ...stration-from-landing-page--doconfirm.html | 14 +- ...from-landing-page--email_confirmation.html | 4 +- ...nding-page--registration_confirmation.html | 2 +- .../data/html_records/View-stats--.html | 16 +- ...w-stats--conferences.MyBikeBike.stats.html | 14 +- ...ats--conferences.MyBikeBike.stats.xls.html | 2 +- .../View-stats--confirm.test.html | 14 +- config/locales/data/translation-info.yml | 384 +++++++++++++++++- config/locales/en.yml | 8 +- .../20150914230507_add_locale_to_workshops.rb | 5 + db/schema.rb | 3 +- features/registration_page.feature | 10 + features/step_definitions/interface_steps.rb | 9 +- features/support/env.rb | 15 +- features/support/factory_girl.rb | 1 + features/support/location_cache.yml | 300 ++++++++++++++ features/support/paths.rb | 2 + 73 files changed, 1840 insertions(+), 187 deletions(-) create mode 100644 config/locales/data/html_records/Edit-a-conference--.html create mode 100644 config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html create mode 100644 config/locales/data/html_records/Edit-a-conference--confirm.test.html create mode 100644 db/migrate/20150914230507_add_locale_to_workshops.rb create mode 100644 features/support/location_cache.yml diff --git a/Gemfile b/Gemfile index 8df4999..9e1435d 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ group :test do gem 'gherkin3', '>= 3.1.0' gem 'cucumber', :git => "git://github.com/cucumber/cucumber-ruby.git", branch: "integrate-gherkin3-parser" gem 'cucumber-core', :git => "git://github.com/cucumber/cucumber-ruby-core.git", branch: "integrate-gherkin3-parser" - gem 'cucumber-rails', :git => "git://github.com/cucumber/cucumber-rails.git" + gem 'cucumber-rails', :git => "git://github.com/cucumber/cucumber-rails.git", require: false #gem 'capybara' gem 'poltergeist' diff --git a/Gemfile.lock b/Gemfile.lock index 4dca924..9f14fcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ GIT GIT remote: git://github.com/cucumber/cucumber-ruby-core.git - revision: 7348412f3421dc8bdbb7e8e4d6036b05818b3353 + revision: 4eaa907716637579a996b10840fce207cc4bd095 branch: integrate-gherkin3-parser specs: cucumber-core (1.2.0) @@ -112,9 +112,9 @@ GEM blockspring (0.1.4) rest-client (> 1.6.7) builder (3.2.2) - cairo (1.14.1) + cairo (1.14.3) pkg-config (>= 1.1.5) - cairo (1.14.1-x86-mingw32) + cairo (1.14.3-x86-mingw32) pkg-config (>= 1.1.5) callsite (0.0.11) capistrano (2.15.6) @@ -160,7 +160,7 @@ GEM safe_yaml (~> 1.0.0) daemon-spawn (0.4.2) daemons (1.2.3) - database_cleaner (1.4.1) + database_cleaner (1.5.0) debug_inspector (0.0.2) delayed_job (4.0.6) activesupport (>= 3.0, < 5.0) @@ -192,16 +192,16 @@ GEM foundation-rails (5.5.2.1) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) - gdk_pixbuf2 (2.2.5) - glib2 (= 2.2.5) - gdk_pixbuf2 (2.2.5-x86-mingw32) - glib2 (= 2.2.5) - geocoder (1.2.9) + gdk_pixbuf2 (3.0.2) + glib2 (= 3.0.2) + gdk_pixbuf2 (3.0.2-x86-mingw32) + glib2 (= 3.0.2) + geocoder (1.2.11) gherkin3 (3.1.1) git-version-bump (0.15.1) - glib2 (2.2.5) + glib2 (3.0.2) pkg-config - glib2 (2.2.5-x86-mingw32) + glib2 (3.0.2-x86-mingw32) cairo (>= 1.12.8) pkg-config globalid (0.3.6) @@ -228,7 +228,7 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - highline (1.7.3) + highline (1.7.5) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) @@ -240,7 +240,7 @@ GEM httpauth (0.2.1) i18n (0.7.0) image_optimizer (1.3.0) - jquery-rails (4.0.4) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -249,7 +249,7 @@ GEM json (1.8.3) jwt (0.1.13) multi_json (>= 1.5) - kgio (2.9.3) + kgio (2.10.0) launchy (2.4.3) addressable (~> 2.3) listen (3.0.3) @@ -266,8 +266,8 @@ GEM railties (>= 3.0.0, < 5.0.0) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.6.1) - mini_magick (4.2.10) + mime-types (2.6.2) + mini_magick (4.3.3) mini_portile (0.6.2) minitest (5.8.0) mocha (1.1.0) @@ -299,6 +299,9 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) + pango (3.0.2-x86-mingw32) + cairo (>= 1.14.0) + glib2 (= 3.0.2) paper_trail (3.0.8) activerecord (>= 3.0, < 5.0) activesupport (>= 3.0, < 5.0) @@ -306,8 +309,8 @@ GEM activesupport (>= 2.3) attr_required (>= 0.0.5) rest-client - pg (0.18.2) - pg (0.18.2-x86-mingw32) + pg (0.18.3) + pg (0.18.3-x86-mingw32) pkg-config (1.1.6) poltergeist (1.6.0) capybara (~> 2.1) @@ -348,7 +351,7 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-i18n (4.0.4) + rails-i18n (4.0.5) i18n (~> 0.6) railties (~> 4.0) rails_12factor (0.0.3) @@ -363,7 +366,7 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.15.0) rake (10.4.2) - rb-fsevent (0.9.5) + rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.3.2) @@ -397,12 +400,13 @@ GEM rspec-mocks (~> 3.3.0) rspec-support (~> 3.3.0) rspec-support (3.3.0) - rsvg2 (2.2.5) + rsvg2 (3.0.2) cairo (>= 1.12.8) - gdk_pixbuf2 (= 2.2.5) - rsvg2 (2.2.5-x86-mingw32) + gdk_pixbuf2 (= 3.0.2) + rsvg2 (3.0.2-x86-mingw32) cairo (>= 1.12.8) - gdk_pixbuf2 (= 2.2.5) + gdk_pixbuf2 (= 3.0.2) + pango (>= 3.0.2) ruby_parser (3.7.1) sexp_processor (~> 4.1) rubyzip (1.1.7) @@ -412,12 +416,12 @@ GEM sass (3.4.18) sass-json-vars (0.3.2) sass (>= 3.1) - sass-rails (5.0.3) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) selenium-webdriver (2.47.1) childprocess (~> 0.5) multi_json (~> 1.0) @@ -437,9 +441,9 @@ GEM bcrypt (~> 3.1) oauth (~> 0.4, >= 0.4.4) oauth2 (>= 0.8.0) - sprockets (3.3.3) + sprockets (3.3.4) rack (~> 1.0) - sprockets-rails (2.3.2) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -447,7 +451,7 @@ GEM tins (~> 1.0) thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.1) tins (1.6.0) tzinfo (1.2.2) thread_safe (~> 0.1) diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 5ed2a33..219a3ae 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -539,6 +539,10 @@ form { font-weight: bold; font-size: 1.25em; } + + .left { + float: left; + } } } @@ -1889,3 +1893,16 @@ html[data-lingua-franca-example="html"] { margin-left: 1em; } } + +.original-text { + margin: 0 0 1em 1em; + h4 { + margin: 0; + } + .value { + margin-left: 1em; + } + p { + font-size: 1.1em; + } +} \ No newline at end of file diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index b905369..23617fc 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -823,7 +823,8 @@ class ConferencesController < ApplicationController set_conference_registration @workshop = Workshop.find_by_id_and_conference_id(params[:workshop_id], @this_conference.id) do_404 unless @workshop - do_403 unless @workshop.can_edit?(current_user) + @can_edit = @workshop.can_edit?(current_user) + do_403 unless @can_edit || @workshop.can_translate?(current_user) @title = @workshop.title @info = @workshop.info @needs = JSON.parse(@workshop.needs || '[]').map &:to_sym @@ -869,20 +870,29 @@ class ConferencesController < ApplicationController def save_workshop set_conference set_conference_registration + if params[:workshop_id] workshop = Workshop.find(params[:workshop_id]) + do_404 unless workshop else workshop = Workshop.new(:conference_id => @this_conference.id) workshop.workshop_facilitators = [WorkshopFacilitator.new(:user_id => current_user.id, :role => :creator)] end + can_edit = workshop.can_edit?(current_user) + do_403 unless can_edit || workshop.can_translate?(current_user) + workshop.title = params[:title] workshop.info = params[:info] - workshop.languages = (params[:languages] || {}).keys.to_json - workshop.needs = (params[:needs] || {}).keys.to_json - workshop.theme = params[:theme] == 'other' ? params[:other_theme] : params[:theme] - workshop.space = params[:space] - workshop.notes = params[:notes] + + if can_edit + # dont allow translators to edit these fields + workshop.languages = (params[:languages] || {}).keys.to_json + workshop.needs = (params[:needs] || {}).keys.to_json + workshop.theme = params[:theme] == 'other' ? params[:other_theme] : params[:theme] + workshop.space = params[:space] + workshop.notes = params[:notes] + end workshop.save redirect_to view_workshop_url(@this_conference.slug, workshop.id) @@ -920,16 +930,16 @@ class ConferencesController < ApplicationController def set_conference_registration @registration = logged_in? ? ConferenceRegistration.find_by(:user_id => current_user.id, :conference_id => @this_conference.id) : nil - @is_host = @conference.host?(current_user) + @is_host = @this_conference.host?(current_user) if @registration || @is_host @submenu = { - register_path(@conference.slug) => 'registration.Registration', - workshops_path(@conference.slug) => 'registration.Workshops' + register_path(@this_conference.slug) => 'registration.Registration', + workshops_path(@this_conference.slug) => 'registration.Workshops' } if @is_host - @submenu[edit_conference_path(@conference.slug)] = 'registration.Edit' - @submenu[stats_path(@conference.slug)] = 'registration.Stats' - @submenu[broadcast_path(@conference.slug)] = 'registration.Broadcast' + @submenu[edit_conference_path(@this_conference.slug)] = 'registration.Edit' + @submenu[stats_path(@this_conference.slug)] = 'registration.Stats' + @submenu[broadcast_path(@this_conference.slug)] = 'registration.Broadcast' end end end diff --git a/app/models/workshop.rb b/app/models/workshop.rb index 90b49db..1d01dbd 100644 --- a/app/models/workshop.rb +++ b/app/models/workshop.rb @@ -1,4 +1,6 @@ class Workshop < ActiveRecord::Base + translates :info, :title + belongs_to :conference has_many :workshop_facilitators, :dependent => :destroy @@ -48,6 +50,10 @@ class Workshop < ActiveRecord::Base workshops ? workshops.size : 0 end + def can_translate?(user) + user.can_translate? || can_edit?(user) + end + private def make_slug if !self.slug diff --git a/app/views/conferences/edit.html.haml b/app/views/conferences/edit.html.haml index a225c2c..6e0f79e 100644 --- a/app/views/conferences/edit.html.haml +++ b/app/views/conferences/edit.html.haml @@ -7,6 +7,10 @@ = label_tag :info = text_area_tag :info, @this_conference.info, :required => true .actions.right + .left + - I18n.backend.enabled_locales.each do |locale| + = (link_to (_'actions.conference.Translate', "Edit #{language_name(locale)} version", :vars => {:language => language_name(locale)}), edit_conference_path(@this_conference.slug, url_params(locale)), :class => 'translate') if locale.to_sym != I18n.locale.to_sym + = button_tag :save, :value => :save :javascript diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 2da428d..9e2e8dc 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -18,7 +18,7 @@ %ul -I18n.backend.enabled_locales.each do |locale| %li - %a{href: request.original_url.gsub(/^(https?:\/\/)(preview\-)?(..\.)?(.*)$/, '\1\2' + locale + '.\4')} + %a{href: home_url(url_params(locale))} =_! locale.upcase %span=I18n.t("languages.#{locale}", locale: locale, context: I18n.t("languages.#{locale}")) .copy diff --git a/app/views/shared/_navbar.html.haml b/app/views/shared/_navbar.html.haml index e24721c..c20f17a 100644 --- a/app/views/shared/_navbar.html.haml +++ b/app/views/shared/_navbar.html.haml @@ -9,11 +9,11 @@ = nav_link about_path, (_'page_titles.About_BikeBike') = nav_link policy_path, (_'page_titles.Safe_Space_Policy') .actions - - if @conference.registration_open + - if @conference && @conference.registration_open - if params[:action] != 'register' && !@registration = link_to register_path(@conference.slug), class: [:button, :register] do =_'conference.actions.Register' - - else + - elsif @conference = render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address) - if current_user = form_tag :logout, class: :logout do diff --git a/app/views/workshops/new.html.haml b/app/views/workshops/new.html.haml index 6365028..07e3b6d 100644 --- a/app/views/workshops/new.html.haml +++ b/app/views/workshops/new.html.haml @@ -8,52 +8,61 @@ .text-field.input-field.big = label_tag :title = text_field_tag :title, @title, :required => true + - if @workshop && I18n.locale.to_s != @workshop.locale.to_s + .original-text + %h4=_'translate.content.Translation_of' + .value=@workshop.title! .text-area-field.input-field = label_tag :info = text_area_tag :info, @info, :required => true - = columns(medium: 6) do - %h3=_'articles.workshops.headings.languages','Workshop Language' - - [:en, :es, :fr].each do |language| - .single-check-box-field.input-field - = label_tag "languages_#{language}" do - = check_box_tag "languages[#{language}]", 1, @languages && @languages.include?(language) - = _"languages.#{language}" - %h3=_'articles.workshops.headings.theme','Theme' - .input-field-help=_'articles.workshops.paragraphs.theme', :p - - theme_found = false - - [:race_gender, :mechanics, :funding, :organization, :community].each do |theme| - .single-radio-button-field.input-field - = label_tag "theme_#{theme}" do - - is_selected = (@theme == theme) - - theme_found ||= is_selected - = radio_button_tag :theme, theme, is_selected - = _"workshop.options.theme.#{theme}" - .single-radio-button-field.other-field.input-field - = label_tag "theme_other" do - = radio_button_tag :theme, :other, (@theme && !theme_found) - %div - = _"workshop.options.theme.other" - = text_field_tag :other_theme, (@theme && !theme_found ? @theme : nil) - = columns(medium: 6) do - %h3=_'articles.workshops.headings.needs','What do you need?' - - [:sound, :projector, :tools].each do |need| - .single-check-box-field.input-field - = label_tag "needs_#{need}" do - = check_box_tag "needs[#{need}]", 1, @needs.include?(need) - = _"workshop.options.needs.#{need}" - %h3=_'articles.workshops.headings.space','Type of space' - .input-field-help=_'articles.workshops.paragraphs.space', :p - - [:meeting_room, :workshop, :outdoor_meeting].each do |space| - .single-radio-button-field.input-field - = label_tag "space_#{space}" do - = radio_button_tag :space, space, @space == space - = _"workshop.options.space.#{space}" - = columns(medium: 12) do - %h3=_'articles.workshops.headings.notes','Notes for Conference Organizers and Workshop Facilitators' - %p=_'articles.workshops.paragraphs.notes','Notes are only viewable by conference hosts and workshop facilitators' - .text-area-field.input-field - = label_tag :notes - = text_area_tag :notes, @notes + - if @workshop && I18n.locale.to_s != @workshop.locale.to_s + .original-text + %h4=_'translate.content.Translation_of' + .value=markdown @workshop.info! + - if !@workshop || @can_edit + = columns(medium: 6) do + %h3=_'articles.workshops.headings.languages','Workshop Language' + - [:en, :es, :fr].each do |language| + .single-check-box-field.input-field + = label_tag "languages_#{language}" do + = check_box_tag "languages[#{language}]", 1, @languages && @languages.include?(language) + = _"languages.#{language}" + %h3=_'articles.workshops.headings.theme','Theme' + .input-field-help=_'articles.workshops.paragraphs.theme', :p + - theme_found = false + - [:race_gender, :mechanics, :funding, :organization, :community].each do |theme| + .single-radio-button-field.input-field + = label_tag "theme_#{theme}" do + - is_selected = (@theme == theme) + - theme_found ||= is_selected + = radio_button_tag :theme, theme, is_selected + = _"workshop.options.theme.#{theme}" + .single-radio-button-field.other-field.input-field + = label_tag "theme_other" do + = radio_button_tag :theme, :other, (@theme && !theme_found) + %div + = _"workshop.options.theme.other" + = text_field_tag :other_theme, (@theme && !theme_found ? @theme : nil) + = columns(medium: 6) do + %h3=_'articles.workshops.headings.needs','What do you need?' + - [:sound, :projector, :tools].each do |need| + .single-check-box-field.input-field + = label_tag "needs_#{need}" do + = check_box_tag "needs[#{need}]", 1, @needs.include?(need) + = _"workshop.options.needs.#{need}" + %h3=_'articles.workshops.headings.space','Type of space' + .input-field-help=_'articles.workshops.paragraphs.space', :p + - [:meeting_room, :workshop, :outdoor_meeting].each do |space| + .single-radio-button-field.input-field + = label_tag "space_#{space}" do + = radio_button_tag :space, space, @space == space + = _"workshop.options.space.#{space}" + = columns(medium: 12) do + %h3=_'articles.workshops.headings.notes','Notes for Conference Organizers and Workshop Facilitators' + %p=_'articles.workshops.paragraphs.notes','Notes are only viewable by conference hosts and workshop facilitators' + .text-area-field.input-field + = label_tag :notes + = text_area_tag :notes, @notes = columns(medium: 12) do .actions.right = button_tag :save, :value => :save diff --git a/app/views/workshops/show.html.haml b/app/views/workshops/show.html.haml index 4b47898..a2bdd1d 100644 --- a/app/views/workshops/show.html.haml +++ b/app/views/workshops/show.html.haml @@ -40,4 +40,7 @@ = columns(medium: 12) do .actions = (link_to (_'actions.workshops.Edit'), edit_workshop_path(@this_conference.slug, @workshop.id), :class => 'button modify') if @workshop.can_edit?(current_user) + - if @workshop.can_translate?(current_user) + - 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.Delete'), delete_workshop_path(@this_conference.slug, @workshop.id), :class => 'button delete') if @workshop.can_delete?(current_user) \ No newline at end of file diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index cd0f699..ff61266 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file. if Rails.env == 'production' || Rails.env == 'preview' - BikeBike::Application.config.session_store :active_record_store, :domain => 'bikebike.org' + BikeBike::Application.config.session_store :active_record_store, :domain => :all else BikeBike::Application.config.session_store :active_record_store end 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 d84220b..a401c48 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -92,11 +92,23 @@ EN
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 cc75c00..e2e009c 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 @@
-

Nullam Porttitor Lacus At Turpis

+

Nam Nulla

You are interested in this workshop
@@ -96,11 +96,23 @@ EN
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 88db509..57d5b1e 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 @@
-

Nullam Porttitor Lacus At Turpis

+

Nam Nulla

No one is interested in this workshop yet @@ -96,11 +96,23 @@ EN
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 fa14b75..57d5b1e 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 @@
-

Nullam Porttitor Lacus At Turpis

+

Nam Nulla

No one is interested in this workshop yet @@ -96,11 +96,23 @@ EN
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--confirm.test.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--confirm.test.html index 234a0c2..3e4b4ae 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--confirm.test.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--confirm.test.html @@ -94,11 +94,23 @@ EN
diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html index 0ca2ec8..7db5a5b 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -92,11 +92,23 @@ EN
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-1.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-1.html index 7d5a22e..e31ec46 100644 --- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-1.html +++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-1.html @@ -100,11 +100,23 @@ EN
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-2.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-2.html index d7e7285..f5633da 100644 --- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-2.html +++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-2.html @@ -100,11 +100,23 @@ EN
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-3.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-3.html index e9e4ce2..244feba 100644 --- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-3.html +++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast-3.html @@ -89,11 +89,23 @@ EN
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 17f09c4..8c24c4a 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 @@ @@ -94,7 +94,7 @@ diff --git a/config/locales/data/html_records/Broadcast-message--confirm.test.html b/config/locales/data/html_records/Broadcast-message--confirm.test.html index 234a0c2..3e4b4ae 100644 --- a/config/locales/data/html_records/Broadcast-message--confirm.test.html +++ b/config/locales/data/html_records/Broadcast-message--confirm.test.html @@ -94,11 +94,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html index 0ca2ec8..7db5a5b 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -92,11 +92,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.register.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.register.html index 5f4c59b..4ca03cd 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.register.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.register.html @@ -106,11 +106,23 @@ EN
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 8f6e6b2..58be65a 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 @@ -87,11 +87,23 @@ EN
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 955a24d..bd8356e 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 @@ -72,6 +72,9 @@
Edit + +Translate into Spanish +Translate into French Delete Workshop
@@ -102,11 +105,23 @@ EN
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 9d6dca4..f91ddd0 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 @@ -72,6 +72,9 @@
Edit + +Translate into Spanish +Translate into French Delete Workshop
@@ -102,11 +105,23 @@ EN
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 010e429..f91ddd0 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 @@ -72,6 +72,9 @@
Edit + +Translate into Spanish +Translate into French Delete Workshop
@@ -102,11 +105,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.delete.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.delete.html index a91a14c..0c84e95 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.delete.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.delete.html @@ -87,11 +87,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.edit.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.edit.html index e0b7812..7def291 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.edit.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.edit.html @@ -171,11 +171,23 @@ EN
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 78148f6..bd8356e 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 @@ -72,6 +72,9 @@
Edit + +Translate into Spanish +Translate into French Delete Workshop
@@ -102,11 +105,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.create.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.create.html index 92bdcb3..69f8df7 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.create.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.create.html @@ -171,11 +171,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html index 8f6e6b2..58be65a 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html @@ -87,11 +87,23 @@ EN
diff --git a/config/locales/data/html_records/Create-workshop--confirm.test.html b/config/locales/data/html_records/Create-workshop--confirm.test.html index 234a0c2..3e4b4ae 100644 --- a/config/locales/data/html_records/Create-workshop--confirm.test.html +++ b/config/locales/data/html_records/Create-workshop--confirm.test.html @@ -94,11 +94,23 @@ EN
diff --git a/config/locales/data/html_records/Edit-a-conference--.html b/config/locales/data/html_records/Edit-a-conference--.html new file mode 100644 index 0000000..861bc78 --- /dev/null +++ b/config/locales/data/html_records/Edit-a-conference--.html @@ -0,0 +1,157 @@ + + + +Bike!Bike! + + + + + + + + + + + + + + +
+ +
+
+

My Bike!Bike!

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

Proposed Workshops

+

Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process.

+
    +
+
+
+
+ + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..1a59268 --- /dev/null +++ b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html @@ -0,0 +1,75 @@ + + + +Bike!Bike! + + + + + + + + + + + + + + +
+ +
+
+ + +
\ No newline at end of file diff --git a/config/locales/data/html_records/Edit-a-conference--confirm.test.html b/config/locales/data/html_records/Edit-a-conference--confirm.test.html new file mode 100644 index 0000000..3e4b4ae --- /dev/null +++ b/config/locales/data/html_records/Edit-a-conference--confirm.test.html @@ -0,0 +1,159 @@ + + + +Bike!Bike! + + + + + + + + + + + + + + +
+ +
+

Please confirm your email address

+
+ + + + + +
+
+
+
+ + + + + + \ 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 d84220b..a401c48 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -92,11 +92,23 @@ EN
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 f717092..6a6508d 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 @@
-

In Est Risus, Auctor Sed, Tristique In, Tempus Sit Amet, Sem

+

Aenean Auctor Gravida Sem

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

Sed ante. Vivamus tortor. Duis mattis egestas metus.

+

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

@@ -96,11 +96,23 @@ EN
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 d1781d5..e0efc50 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 @@
-

In Est Risus, Auctor Sed, Tristique In, Tempus Sit Amet, Sem

+

Aenean Auctor Gravida Sem

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

Sed ante. Vivamus tortor. Duis mattis egestas metus.

+

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

@@ -96,11 +96,23 @@ EN
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 4f2bacc..e0efc50 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 @@
-

In Est Risus, Auctor Sed, Tristique In, Tempus Sit Amet, Sem

+

Aenean Auctor Gravida Sem

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

Sed ante. Vivamus tortor. Duis mattis egestas metus.

+

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

@@ -96,11 +96,23 @@ EN
diff --git a/config/locales/data/html_records/Like-a-workshop--confirm.test.html b/config/locales/data/html_records/Like-a-workshop--confirm.test.html index 234a0c2..3e4b4ae 100644 --- a/config/locales/data/html_records/Like-a-workshop--confirm.test.html +++ b/config/locales/data/html_records/Like-a-workshop--confirm.test.html @@ -94,11 +94,23 @@ EN
diff --git a/config/locales/data/html_records/Read-the-about-page--about.html b/config/locales/data/html_records/Read-the-about-page--about.html index 45706f5..8cc6c1d 100644 --- a/config/locales/data/html_records/Read-the-about-page--about.html +++ b/config/locales/data/html_records/Read-the-about-page--about.html @@ -101,11 +101,23 @@ EN
diff --git a/config/locales/data/html_records/Read-the-policy-page--policy.html b/config/locales/data/html_records/Read-the-policy-page--policy.html index 6ae441b..7795586 100644 --- a/config/locales/data/html_records/Read-the-policy-page--policy.html +++ b/config/locales/data/html_records/Read-the-policy-page--policy.html @@ -99,11 +99,23 @@ EN
diff --git a/config/locales/data/html_records/See-a-404-page--error_404.html b/config/locales/data/html_records/See-a-404-page--error_404.html index 7e42bd7..03a65df 100644 --- a/config/locales/data/html_records/See-a-404-page--error_404.html +++ b/config/locales/data/html_records/See-a-404-page--error_404.html @@ -96,11 +96,23 @@ EN
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 f52213b..31c4c41 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -96,11 +96,23 @@ EN
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 f2808a6..0a8ba70 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -87,11 +87,23 @@ EN
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 01739ad..8d72d58 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -62,7 +62,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

My Awesome Workshop

-

Etiam vel augue. Vestibulum rutrum rutrum neque. Aenean auctor gravida sem.

+

In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo.

@@ -94,11 +94,23 @@ EN
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 c037eec..523e803 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 6d48df4..4fc3880 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-2.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-2.html index c62267c..8b408aa 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-2.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-2.html @@ -105,11 +105,23 @@ EN
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-4.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-4.html index 116a77a..47b20e4 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-4.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-4.html @@ -102,11 +102,23 @@ EN
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-5.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-5.html index 116a77a..47b20e4 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-5.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-5.html @@ -102,11 +102,23 @@ EN
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-6.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-6.html index 9140cb8..8ff0211 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-6.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-6.html @@ -141,11 +141,23 @@ EN
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.html index 02f6026..716dd12 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.html @@ -83,11 +83,23 @@ EN
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token.html index e58ce58..d0b3762 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token.html @@ -86,11 +86,23 @@ EN
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--doconfirm.html b/config/locales/data/html_records/Start-registration-from-landing-page--doconfirm.html index 471c878..bbf8895 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--doconfirm.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--doconfirm.html @@ -89,11 +89,23 @@ EN
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 c037eec..523e803 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 6d48df4..4fc3880 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 4bc13b7..fa4343a 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 14 – 18, 2015 +August 15 – 19, 2015
@@ -92,11 +92,23 @@ EN
diff --git a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.html b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.html index 248d70b..9df0a22 100644 --- a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.html +++ b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.html @@ -148,11 +148,23 @@ EN
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 e1399e4..09801ba 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/html_records/View-stats--confirm.test.html b/config/locales/data/html_records/View-stats--confirm.test.html index 234a0c2..3e4b4ae 100644 --- a/config/locales/data/html_records/View-stats--confirm.test.html +++ b/config/locales/data/html_records/View-stats--confirm.test.html @@ -94,11 +94,23 @@ EN
diff --git a/config/locales/data/translation-info.yml b/config/locales/data/translation-info.yml index f7e18e0..24c2118 100644 --- a/config/locales/data/translation-info.yml +++ b/config/locales/data/translation-info.yml @@ -17,6 +17,7 @@ date.formats.span_same_month_date_1: - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- - Broadcast-message-- + - Edit-a-conference-- date.month_names: pages: - "/" @@ -32,6 +33,7 @@ date.month_names: - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- - Broadcast-message-- + - Edit-a-conference-- date.formats.span_same_month_date_2: pages: - "/" @@ -44,6 +46,7 @@ date.formats.span_same_month_date_2: - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- - Broadcast-message-- + - Edit-a-conference-- date.date_span: pages: - "/" @@ -59,6 +62,7 @@ date.date_span: - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- - Broadcast-message-- + - Edit-a-conference-- articles.workshops.headings.Proposed_Workshops: pages: - "/" @@ -71,6 +75,7 @@ articles.workshops.headings.Proposed_Workshops: - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- - Broadcast-message-- + - Edit-a-conference-- articles.workshops.paragraphs.Proposed_Workshops: pages: - "/" @@ -86,6 +91,7 @@ articles.workshops.paragraphs.Proposed_Workshops: - Be-the-first-to-like-a-workshop-- - Like-a-workshop-- - Broadcast-message-- + - Edit-a-conference-- page_descriptions.home: pages: - "/" @@ -100,6 +106,7 @@ page_descriptions.home: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -147,6 +154,9 @@ page_descriptions.home: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -164,6 +174,7 @@ page_titles.About_BikeBike: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -211,6 +222,9 @@ page_titles.About_BikeBike: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -228,6 +242,7 @@ page_titles.Safe_Space_Policy: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -275,6 +290,9 @@ page_titles.Safe_Space_Policy: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -304,6 +322,7 @@ links.footer.text.File_an_Issue: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -351,6 +370,9 @@ links.footer.text.File_an_Issue: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -368,6 +390,7 @@ links.footer.text.Help_contribute: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -415,6 +438,9 @@ links.footer.text.Help_contribute: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -432,6 +458,7 @@ links.footer.help_text.facebook: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -480,6 +507,9 @@ links.footer.help_text.facebook: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -497,6 +527,7 @@ links.footer.help_text.select_language: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -545,6 +576,9 @@ links.footer.help_text.select_language: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -562,6 +596,7 @@ languages.en: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -658,6 +693,12 @@ languages.en: - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-about-page--about - Read-the-policy-page--policy @@ -665,6 +706,268 @@ languages.en: - See-a-404-page--error_404 - See-a-404-page--error_404 context: English +languages.es: + pages: + - "/" + - "/conferences/:slug/register" + - "/doconfirm" + - "/conferences/:slug/register/:button/:confirmation_token" + - "/confirm/:token" + - "/conferences/:slug/stats" + - "/conferences/:slug/workshops" + - "/conferences/:slug/workshops/create" + - "/conferences/:slug/workshops/:workshop_id" + - "/conferences/:slug/workshops/:workshop_id/edit" + - "/conferences/:slug/workshops/:workshop_id/delete" + - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" + - "/about" + - "/policy" + - "/error_404" + 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 + - Start-registration-from-landing-page--conferences.MyBikeBike.register + - Start-registration-from-landing-page--conferences.MyBikeBike.register-1 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-1 + - Start-registration-from-landing-page--doconfirm + - Start-registration-from-landing-page--doconfirm + - Start-registration-from-landing-page--conferences.MyBikeBike.register-2 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-2 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-5 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-5 + - Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token + - Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token + - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 + - View-stats--confirm.test + - View-stats--confirm.test + - View-stats-- + - View-stats-- + - View-stats--conferences.MyBikeBike.stats + - View-stats--conferences.MyBikeBike.stats + - Create-workshop--confirm.test + - Create-workshop--confirm.test + - Create-workshop-- + - Create-workshop-- + - Create-workshop--conferences.MyBikeBike.register + - Create-workshop--conferences.MyBikeBike.register + - Create-workshop--conferences.MyBikeBike.workshops + - Create-workshop--conferences.MyBikeBike.workshops + - Create-workshop--conferences.MyBikeBike.workshops.create + - Create-workshop--conferences.MyBikeBike.workshops.create + - 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 + - Create-workshop--conferences.MyBikeBike.workshops.1.edit + - 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 + - Create-workshop--conferences.MyBikeBike.workshops.1.delete + - Create-workshop--conferences.MyBikeBike.workshops-1 + - Create-workshop--conferences.MyBikeBike.workshops-1 + - Be-the-first-to-like-a-workshop--confirm.test + - Be-the-first-to-like-a-workshop--confirm.test + - Be-the-first-to-like-a-workshop-- + - Be-the-first-to-like-a-workshop-- + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Like-a-workshop--confirm.test + - Like-a-workshop--confirm.test + - Like-a-workshop-- + - Like-a-workshop-- + - Like-a-workshop--conferences.MyBikeBike.workshops.1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Broadcast-message--confirm.test + - Broadcast-message--confirm.test + - Broadcast-message-- + - Broadcast-message-- + - Broadcast-message--conferences.MyBikeBike.broadcast + - Broadcast-message--conferences.MyBikeBike.broadcast + - Broadcast-message--conferences.MyBikeBike.broadcast-1 + - Broadcast-message--conferences.MyBikeBike.broadcast-1 + - Broadcast-message--conferences.MyBikeBike.broadcast-2 + - Broadcast-message--conferences.MyBikeBike.broadcast-2 + - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit + - Read-the-about-page--about + - Read-the-about-page--about + - Read-the-policy-page--policy + - Read-the-policy-page--policy + - See-a-404-page--error_404 + - See-a-404-page--error_404 + context: Spanish +languages.fr: + pages: + - "/" + - "/conferences/:slug/register" + - "/doconfirm" + - "/conferences/:slug/register/:button/:confirmation_token" + - "/confirm/:token" + - "/conferences/:slug/stats" + - "/conferences/:slug/workshops" + - "/conferences/:slug/workshops/create" + - "/conferences/:slug/workshops/:workshop_id" + - "/conferences/:slug/workshops/:workshop_id/edit" + - "/conferences/:slug/workshops/:workshop_id/delete" + - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" + - "/about" + - "/policy" + - "/error_404" + 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 + - Start-registration-from-landing-page--conferences.MyBikeBike.register + - Start-registration-from-landing-page--conferences.MyBikeBike.register-1 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-1 + - Start-registration-from-landing-page--doconfirm + - Start-registration-from-landing-page--doconfirm + - Start-registration-from-landing-page--conferences.MyBikeBike.register-2 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-2 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-5 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-5 + - Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token + - Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token + - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 + - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 + - View-stats--confirm.test + - View-stats--confirm.test + - View-stats-- + - View-stats-- + - View-stats--conferences.MyBikeBike.stats + - View-stats--conferences.MyBikeBike.stats + - Create-workshop--confirm.test + - Create-workshop--confirm.test + - Create-workshop-- + - Create-workshop-- + - Create-workshop--conferences.MyBikeBike.register + - Create-workshop--conferences.MyBikeBike.register + - Create-workshop--conferences.MyBikeBike.workshops + - Create-workshop--conferences.MyBikeBike.workshops + - Create-workshop--conferences.MyBikeBike.workshops.create + - Create-workshop--conferences.MyBikeBike.workshops.create + - 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 + - Create-workshop--conferences.MyBikeBike.workshops.1.edit + - 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 + - Create-workshop--conferences.MyBikeBike.workshops.1.delete + - Create-workshop--conferences.MyBikeBike.workshops-1 + - Create-workshop--conferences.MyBikeBike.workshops-1 + - Be-the-first-to-like-a-workshop--confirm.test + - Be-the-first-to-like-a-workshop--confirm.test + - Be-the-first-to-like-a-workshop-- + - Be-the-first-to-like-a-workshop-- + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Like-a-workshop--confirm.test + - Like-a-workshop--confirm.test + - Like-a-workshop-- + - Like-a-workshop-- + - Like-a-workshop--conferences.MyBikeBike.workshops.1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-1 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Like-a-workshop--conferences.MyBikeBike.workshops.1-2 + - Broadcast-message--confirm.test + - Broadcast-message--confirm.test + - Broadcast-message-- + - Broadcast-message-- + - Broadcast-message--conferences.MyBikeBike.broadcast + - Broadcast-message--conferences.MyBikeBike.broadcast + - Broadcast-message--conferences.MyBikeBike.broadcast-1 + - Broadcast-message--conferences.MyBikeBike.broadcast-1 + - Broadcast-message--conferences.MyBikeBike.broadcast-2 + - Broadcast-message--conferences.MyBikeBike.broadcast-2 + - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit + - Read-the-about-page--about + - Read-the-about-page--about + - Read-the-policy-page--policy + - Read-the-policy-page--policy + - See-a-404-page--error_404 + - See-a-404-page--error_404 + context: French links.footer.help_text.contributors: pages: - "/" @@ -679,6 +982,7 @@ links.footer.help_text.contributors: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" - "/about" - "/policy" - "/error_404" @@ -727,6 +1031,9 @@ links.footer.help_text.contributors: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--confirm.test + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit - Read-the-about-page--about - Read-the-policy-page--policy - See-a-404-page--error_404 @@ -754,6 +1061,8 @@ conference.actions.Register: - Like-a-workshop-- - Broadcast-message--confirm.test - Broadcast-message-- + - Edit-a-conference--confirm.test + - Edit-a-conference-- page_titles.conferences.Conference_Registration: pages: - "/conferences/:slug/register" @@ -794,6 +1103,7 @@ forms.labels.generic.email: - Be-the-first-to-like-a-workshop--confirm.test - Like-a-workshop--confirm.test - Broadcast-message--confirm.test + - Edit-a-conference--confirm.test forms.actions.generic.register: pages: - "/conferences/:slug/register" @@ -990,6 +1300,7 @@ forms.actions.generic.Log_out: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" examples: - Start-registration-from-landing-page--conferences.MyBikeBike.register-2 - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 @@ -1023,6 +1334,8 @@ forms.actions.generic.Log_out: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference-- + - Edit-a-conference--conferences.MyBikeBike.edit articles.conference_registration.headings.Registration_Info: pages: - "/conferences/:slug/register" @@ -1086,24 +1399,6 @@ articles.conference_registration.headings.languages: - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 - Start-registration-from-landing-page--conferences.MyBikeBike.register-6 - View-stats--conferences.MyBikeBike.stats.xls -languages.es: - pages: - - "/conferences/:slug/register" - - "/conferences/:slug/workshops/create" - - "/conferences/:slug/workshops/:workshop_id/edit" - examples: - - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 - - Create-workshop--conferences.MyBikeBike.workshops.create - - Create-workshop--conferences.MyBikeBike.workshops.1.edit -languages.fr: - pages: - - "/conferences/:slug/register" - - "/conferences/:slug/workshops/create" - - "/conferences/:slug/workshops/:workshop_id/edit" - examples: - - Start-registration-from-landing-page--conferences.MyBikeBike.register-3 - - Create-workshop--conferences.MyBikeBike.workshops.create - - Create-workshop--conferences.MyBikeBike.workshops.1.edit articles.conference_registration.headings.housing: pages: - "/conferences/:slug/register" @@ -1311,6 +1606,7 @@ menu.submenu.registration.Registration: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" examples: - Start-registration-from-landing-page--conferences.MyBikeBike.register-5 - Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token @@ -1336,6 +1632,7 @@ menu.submenu.registration.Registration: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--conferences.MyBikeBike.edit menu.submenu.registration.Workshops: pages: - "/conferences/:slug/register" @@ -1347,6 +1644,7 @@ menu.submenu.registration.Workshops: - "/conferences/:slug/workshops/:workshop_id/edit" - "/conferences/:slug/workshops/:workshop_id/delete" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" examples: - Start-registration-from-landing-page--conferences.MyBikeBike.register-5 - Start-registration-from-landing-page--conferences.MyBikeBike.register.paypal_confirm.token @@ -1372,6 +1670,7 @@ menu.submenu.registration.Workshops: - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--conferences.MyBikeBike.edit articles.conference_registration.headings.payment_confirm: pages: - "/conferences/:slug/register/:button/:confirmation_token" @@ -1470,6 +1769,7 @@ page_titles.403.Please_Confirm_Email: - Be-the-first-to-like-a-workshop--confirm.test - Like-a-workshop--confirm.test - Broadcast-message--confirm.test + - Edit-a-conference--confirm.test articles.permission_denied.headings.confirm_email: pages: - "/confirm/:token" @@ -1480,6 +1780,7 @@ articles.permission_denied.headings.confirm_email: - Be-the-first-to-like-a-workshop--confirm.test - Like-a-workshop--confirm.test - Broadcast-message--confirm.test + - Edit-a-conference--confirm.test forms.actions.generic.login: pages: - "/confirm/:token" @@ -1489,6 +1790,7 @@ forms.actions.generic.login: - Be-the-first-to-like-a-workshop--confirm.test - Like-a-workshop--confirm.test - Broadcast-message--confirm.test + - Edit-a-conference--confirm.test geography.subregions.US.AK: pages: - "/" @@ -1560,32 +1862,38 @@ menu.submenu.registration.Edit: pages: - "/conferences/:slug/stats" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" examples: - View-stats--conferences.MyBikeBike.stats - Broadcast-message--conferences.MyBikeBike.broadcast - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--conferences.MyBikeBike.edit menu.submenu.registration.Stats: pages: - "/conferences/:slug/stats" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" examples: - View-stats--conferences.MyBikeBike.stats - Broadcast-message--conferences.MyBikeBike.broadcast - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--conferences.MyBikeBike.edit menu.submenu.registration.Broadcast: pages: - "/conferences/:slug/stats" - "/conferences/:slug/broadcast" + - "/conferences/:slug/edit" examples: - View-stats--conferences.MyBikeBike.stats - Broadcast-message--conferences.MyBikeBike.broadcast - Broadcast-message--conferences.MyBikeBike.broadcast-1 - Broadcast-message--conferences.MyBikeBike.broadcast-2 - Broadcast-message--conferences.MyBikeBike.broadcast-3 + - Edit-a-conference--conferences.MyBikeBike.edit articles.conference_registration.headings.email: pages: - "/conferences/:slug/stats" @@ -1670,9 +1978,11 @@ forms.labels.generic.info: pages: - "/conferences/:slug/workshops/create" - "/conferences/:slug/workshops/:workshop_id/edit" + - "/conferences/:slug/edit" examples: - Create-workshop--conferences.MyBikeBike.workshops.create - Create-workshop--conferences.MyBikeBike.workshops.1.edit + - Edit-a-conference--conferences.MyBikeBike.edit articles.workshops.headings.languages: pages: - "/conferences/:slug/workshops/create" @@ -1847,9 +2157,11 @@ forms.actions.generic.save: pages: - "/conferences/:slug/workshops/create" - "/conferences/:slug/workshops/:workshop_id/edit" + - "/conferences/:slug/edit" examples: - Create-workshop--conferences.MyBikeBike.workshops.create - Create-workshop--conferences.MyBikeBike.workshops.1.edit + - Edit-a-conference--conferences.MyBikeBike.edit page_titles.conferences.View_Workshop: pages: - "/conferences/:slug/workshops/:workshop_id" @@ -1909,6 +2221,22 @@ actions.workshops.Edit: - Create-workshop--conferences.MyBikeBike.workshops.1-1 - Create-workshop--conferences.MyBikeBike.workshops.1-2 - Create-workshop--conferences.MyBikeBike.workshops.1-3 +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 actions.workshops.Delete: pages: - "/conferences/:slug/workshops/:workshop_id" @@ -2055,6 +2383,26 @@ articles.conference_registration.paragraphs.participants_emailed: - :conference_title examples: - Broadcast-message--conferences.MyBikeBike.broadcast-3 +geography.subregions.US.OR: + pages: + - "/" + examples: + - Edit-a-conference-- +page_titles.conferences.Edit: + pages: + - "/conferences/:slug/edit" + examples: + - Edit-a-conference--conferences.MyBikeBike.edit +actions.conference.Translate: + pages: + - "/conferences/:slug/edit" + context: Edit Spanish + version + vars: + - :language + examples: + - Edit-a-conference--conferences.MyBikeBike.edit + - Edit-a-conference--conferences.MyBikeBike.edit page_titles.about.About_BikeBike: pages: - "/about" diff --git a/config/locales/en.yml b/config/locales/en.yml index 45a6dea..e8ce9c9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5456,7 +5456,9 @@ en: Workshops: Workshops Your_Workshops: Your Workshops paragraphs: - Proposed_Workshops: Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process. + Proposed_Workshops: Would you like to facilitate your own workshop? Simply + register and visit the workshops page. If you have already registered you + can access the page by restarting the registration process. info: Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics) @@ -5545,6 +5547,7 @@ en: Workshops: Workshops Delete_Workshop: Create Workshop Edit_Workshop: Edit Workshop + Edit: Edit Conference policy: Safer_Spaces_Policy: Safer Space Agreement '404': @@ -5578,6 +5581,9 @@ en: create: New Workshop Delete: Delete Workshop Edit: Edit + Translate: Translate into %{language} + conference: + Translate: Edit %{language} version error: '404': description: Sorry, we couldn't find the page you were looking for. If you really diff --git a/db/migrate/20150914230507_add_locale_to_workshops.rb b/db/migrate/20150914230507_add_locale_to_workshops.rb new file mode 100644 index 0000000..2d614bc --- /dev/null +++ b/db/migrate/20150914230507_add_locale_to_workshops.rb @@ -0,0 +1,5 @@ +class AddLocaleToWorkshops < ActiveRecord::Migration + def change + add_column :workshops, :locale, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index d79622f..621d3f3 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: 20150912010105) do +ActiveRecord::Schema.define(version: 20150914230507) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -386,6 +386,7 @@ ActiveRecord::Schema.define(version: 20150912010105) do t.string "theme" t.text "host_info" t.text "notes" + t.string "locale" end end diff --git a/features/registration_page.feature b/features/registration_page.feature index 4e23ecc..30f69b2 100644 --- a/features/registration_page.feature +++ b/features/registration_page.feature @@ -168,3 +168,13 @@ Feature: Registration Page Then I should see email has been sent And I should see Preview And I should see My Subject + + Scenario: Edit a conference + Given There is an upcoming conference in Portland OR + And Registration is open + And I am logged in as somebody@bikebike.org + And My name is John Doe + And I am a conference host + And I am registered for the conference + And I am on the edit conference page + Then I should see Edit Spanish diff --git a/features/step_definitions/interface_steps.rb b/features/step_definitions/interface_steps.rb index b8e030d..d6abff6 100644 --- a/features/step_definitions/interface_steps.rb +++ b/features/step_definitions/interface_steps.rb @@ -78,23 +78,23 @@ Given(/^There is an upcoming conference( in .+)?$/) do |location| end end -Given(/^an organization( named .+)? exists( in .+)?$/) do |name, location| +Given(/^an organization( named .+)? exists in (.+)?$/) do |name, location| if location =~ /every country/i Carmen::World.instance.subregions.each { |country| if country.subregions? country.subregions.each { |region| - org = Organization.new(name: rand(36**16).to_s(36), slug: rand(36**16).to_s(36))#create_org#(Forgery::LoremIpsum.sentence) + org = Organization.new(name: rand(36**16).to_s(36), slug: rand(36**16).to_s(36)) org.locations << Location.new(city: 'City', country: country.code, territory: region.code) org.save! } else - org = Organization.new(name: rand(36**16).to_s(36), slug: rand(36**16).to_s(36))#create_org#(Forgery::LoremIpsum.sentence) + org = Organization.new(name: rand(36**16).to_s(36), slug: rand(36**16).to_s(36)) org.locations << Location.new(city: 'City', country: country.code) org.save! end } else - create_org(name ? name.gsub(/^\s*named\s+(.*?)\s*$/, '\1') : nil, location ? location.gsub(/^\s*in\s+(.*?)\s*$/, '\1') : nil) + create_org(name ? name.gsub(/^\s*named\s+(.*?)\s*$/, '\1') : nil, location) end end @@ -103,6 +103,7 @@ Given(/^a workshop( titled .+)? exists?$/) do |title| workshop.conference_id = @last_conference.id workshop.title = title ? title.gsub(/^\s*titled\s*(.*?)\s*$/, '\1') : Forgery::LoremIpsum.sentence({:random => true}).gsub(/\.$/, '').titlecase workshop.info = Forgery::LoremIpsum.paragraph({:random => true}) + workshop.locale = :en workshop.save @last_workshop = workshop end diff --git a/features/support/env.rb b/features/support/env.rb index 2cb3530..85b6a5f 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -109,8 +109,15 @@ end def create_org(name = nil, location = nil) org = FactoryGirl.create(:org) found_location = nil - if !location.nil? - l = Geocoder.search(location).first + if location.present? + cache_file = File.join(File.dirname(__FILE__), 'location_cache.yml') + cache = File.exists?(cache_file) ? YAML.load_file(cache_file) : {} + l = cache[location] + if l.nil? + l = Geocoder.search(location).first + cache[location] = l + File.open(cache_file, 'w') { |f| f.write cache.to_yaml } + end begin found_location = Location.new(city: l.city, territory: l.province_code, country: l.country_code, latitude: l.latitude, longitude: l.longitude) rescue; end @@ -120,11 +127,11 @@ def create_org(name = nil, location = nil) return org end end - if !name.nil? + if name.present? org.name = name org.slug = org.generate_slug(name, found_location) end - if !found_location.nil? + if found_location.present? org.locations << found_location end org.save! diff --git a/features/support/factory_girl.rb b/features/support/factory_girl.rb index fa08682..f1e4820 100644 --- a/features/support/factory_girl.rb +++ b/features/support/factory_girl.rb @@ -10,6 +10,7 @@ FactoryGirl.define do end_date Date.today - 26.days conference_type_id (ConferenceType.find_by(:slug => 'bikebike') || ConferenceType.create(:slug => 'bikebike')).id paypal_username 'joe' + locale 'en' end factory :org, :class => 'Organization' do diff --git a/features/support/location_cache.yml b/features/support/location_cache.yml new file mode 100644 index 0000000..6545988 --- /dev/null +++ b/features/support/location_cache.yml @@ -0,0 +1,300 @@ +--- +" in Halifax NS": !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Halifax + short_name: Halifax + types: + - locality + - political + - long_name: Halifax + short_name: Halifax + types: + - administrative_area_level_3 + - political + - long_name: Halifax Regional Municipality + short_name: Halifax Regional Municipality + types: + - administrative_area_level_2 + - political + - long_name: Nova Scotia + short_name: NS + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + formatted_address: Halifax, NS, Canada + geometry: + bounds: + northeast: + lat: 44.7035313 + lng: -63.5576784 + southwest: + lat: 44.5949302 + lng: -63.68627009999999 + location: + lat: 44.6488625 + lng: -63.5753196 + location_type: APPROXIMATE + viewport: + northeast: + lat: 44.7035313 + lng: -63.5576784 + southwest: + lat: 44.5949302 + lng: -63.68627009999999 + partial_match: true + place_id: ChIJwfrbBxQhWksR3C2LQ6bja2Y + types: + - locality + - political + cache_hit: +" in Sackville NB": !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Sackville + short_name: Sackville + types: + - locality + - political + - long_name: Westmorland County + short_name: Westmorland County + types: + - administrative_area_level_2 + - political + - long_name: New Brunswick + short_name: NB + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + formatted_address: Sackville, NB, Canada + geometry: + bounds: + northeast: + lat: 45.96934 + lng: -64.31345000000002 + southwest: + lat: 45.86707 + lng: -64.4562439 + location: + lat: 45.897903 + lng: -64.3682803 + location_type: APPROXIMATE + viewport: + northeast: + lat: 45.96934 + lng: -64.31345000000002 + southwest: + lat: 45.86707 + lng: -64.4562439 + partial_match: true + place_id: ChIJA-OnietQX0sR3kWeYPsw4gs + types: + - locality + - political + cache_hit: +" in Anchorage AK": !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Anchorage + short_name: Anchorage + types: + - locality + - political + - long_name: Anchorage + short_name: Anchorage + types: + - administrative_area_level_2 + - political + - long_name: Alaska + short_name: AK + types: + - administrative_area_level_1 + - political + - long_name: United States + short_name: US + types: + - country + - political + formatted_address: Anchorage, AK, USA + geometry: + bounds: + northeast: + lat: 61.4838912 + lng: -148.460007 + southwest: + lat: 60.733791 + lng: -150.2862833 + location: + lat: 61.2180556 + lng: -149.9002778 + location_type: APPROXIMATE + viewport: + northeast: + lat: 61.4838912 + lng: -148.460007 + southwest: + lat: 60.733791 + lng: -150.2862833 + partial_match: true + place_id: ChIJQT-zBHaRyFYR42iEp1q6fSU + types: + - locality + - political + cache_hit: +" in San Marcos TX": !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: San Marcos + short_name: San Marcos + types: + - locality + - political + - long_name: Hays County + short_name: Hays County + types: + - administrative_area_level_2 + - political + - long_name: Texas + short_name: TX + types: + - administrative_area_level_1 + - political + - long_name: United States + short_name: US + types: + - country + - political + formatted_address: San Marcos, TX, USA + geometry: + bounds: + northeast: + lat: 29.9605819 + lng: -97.8419149 + southwest: + lat: 29.777154 + lng: -98.012087 + location: + lat: 29.8832749 + lng: -97.9413941 + location_type: APPROXIMATE + viewport: + northeast: + lat: 29.9605819 + lng: -97.8419149 + southwest: + lat: 29.777154 + lng: -98.012087 + partial_match: true + place_id: ChIJWUZBNCqnXIYRJzGOU2wzOi8 + types: + - locality + - political + cache_hit: +" in Guadalajara Mexico": !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Guadalajara + short_name: Guadalajara + types: + - locality + - political + - long_name: Guadalajara + short_name: Guadalajara + types: + - administrative_area_level_2 + - political + - long_name: Jalisco + short_name: Jal. + types: + - administrative_area_level_1 + - political + - long_name: Mexico + short_name: MX + types: + - country + - political + formatted_address: Guadalajara, Jalisco, Mexico + geometry: + bounds: + northeast: + lat: 20.7438464 + lng: -103.2637617 + southwest: + lat: 20.6037373 + lng: -103.4070646 + location: + lat: 20.6596988 + lng: -103.3496092 + location_type: APPROXIMATE + viewport: + northeast: + lat: 20.7438464 + lng: -103.2637617 + southwest: + lat: 20.6037373 + lng: -103.4070646 + partial_match: true + place_id: ChIJm9MvtYyxKIQRUFeGvwKTPdY + types: + - locality + - political + cache_hit: +" in Portland OR": !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Portland + short_name: Portland + types: + - locality + - political + - long_name: Multnomah County + short_name: Multnomah County + types: + - administrative_area_level_2 + - political + - long_name: Oregon + short_name: OR + types: + - administrative_area_level_1 + - political + - long_name: United States + short_name: US + types: + - country + - political + formatted_address: Portland, OR, USA + geometry: + bounds: + northeast: + lat: 45.6524799 + lng: -122.4718489 + southwest: + lat: 45.432393 + lng: -122.8369952 + location: + lat: 45.5230622 + lng: -122.6764816 + location_type: APPROXIMATE + viewport: + northeast: + lat: 45.6524799 + lng: -122.4718489 + southwest: + lat: 45.432393 + lng: -122.8369952 + partial_match: true + place_id: ChIJJ3SpfQsLlVQRkYXR9ua5Nhw + types: + - locality + - political + cache_hit: diff --git a/features/support/paths.rb b/features/support/paths.rb index 256b612..db48611 100644 --- a/features/support/paths.rb +++ b/features/support/paths.rb @@ -7,6 +7,8 @@ module NavigationHelpers path = :home when /^registration$/i path = "/conferences/#{@last_conference.slug}/register/" + when /^edit conference$/i + path = "/conferences/#{@last_conference.slug}/edit/" when /^(workshops|stats|broadcast)$/i path = "/conferences/#{@last_conference.slug}/#{path}/" end
- +
-© 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-14 01:24:172015-09-15 04:09:19 English 2015-09-28 00:00:00 2015-09-28 00:00:00