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

Rakefile

@@ -71,6 +71,12 @@ task :i18n do
   end
 end
 
+task 'i18n:debug' do
+  ENV['I18N_DEBUG'] = '1'
+  Rake::Task['i18n'].execute
+  ENV['I18N_DEBUG'] = '0'
+end
+
 task :css do
   ENV['CSS_TEST'] = '1'
   Rake::Task['cucumber:run'].execute

app/assets/stylesheets/_application.scss

@@ -3355,7 +3355,8 @@ body.policy .policy-agreement ul {
             height: 1.25em;
             line-height: 1.25em;
             text-align: center;
-            margin: 0;// 0.3333em 0 0;
+            margin: 0;
+            text-shadow: 0.0333em 0.0333em 0.06667em $black;
         }
     }
 

app/controllers/conference_administration_controller.rb

@@ -342,25 +342,19 @@ class ConferenceAdministrationController < ApplicationController
     end
 
     def administrate_stats
+      if @this_conference.start_date.blank? || @this_conference.end_date.blank?
+        @warning_message = :no_date_warning
+        return
+      end
+
+      get_stats(!request.format.xlsx?)
+
       if request.format.xlsx?
-        get_stats
         logger.info "Generating stats.xls"
         return respond_to do |format|
           format.xlsx { render xlsx: '../conferences/stats', filename: "stats-#{DateTime.now.strftime('%Y-%m-%d')}" }
         end
       else
-        @past_conferences = []
-        Conference.all.order("start_date DESC").each do |conference|
-          @past_conferences << conference if conference.is_public && @this_conference.id != conference.id
-        end
-
-        if @this_conference.start_date.blank? || @this_conference.end_date.blank?
-          @warning_message = :no_date_warning
-          return
-        end
-
-        get_stats(true)
-
         @registration_count = @registrations.size
         @completed_registrations = 0
         @bikes = 0
@@ -384,6 +378,11 @@ class ConferenceAdministrationController < ApplicationController
             end
           end
         end
+
+        @past_conferences = []
+        Conference.all.order("start_date DESC").each do |conference|
+          @past_conferences << conference if conference.is_public && @this_conference.id != conference.id
+        end
       end
     end
 

app/controllers/conferences_controller.rb

@@ -78,7 +78,7 @@ class ConferencesController < ApplicationController
           return redirect_to pp_response.redirect_uri
         end
       end
-
+begin
       # get the current step
       @step = current_registration_step(@this_conference, current_user)
 
@@ -97,6 +97,11 @@ class ConferencesController < ApplicationController
       result = registration_step(@step, @this_conference, current_user)
       # pass any data on to the view
       data_to_instance_variables(result)
+rescue Exception => e
+  puts e
+  puts e.backtrace.join("\n")
+  raise e
+end
     end
 
     if request.xhr?

app/views/conference_administration/_stats.html.haml

@@ -3,15 +3,15 @@
     = data_set(:h3, 'articles.admin.stats.headings.completed_registrations') do
       = (@completed_registrations || 0).to_s
     = data_set(:h3, 'articles.admin.stats.headings.incomplete_registrations') do
-      = ((@registration_count || 0) - (@completed_registrations || 0)).to_s
+      = ((@registration_count - @completed_registrations) || 0).to_s
     = data_set(:h3, 'articles.admin.stats.headings.bikes') do
       = (@completed_registrations || 0) > 0 ? "#{@bikes} (#{number_to_percentage(@bikes / @completed_registrations.to_f * 100.0)})" : "0"
     = data_set(:h3, 'articles.admin.stats.headings.food.meat') do
-      = @food && (@food[:all] || 0) > 0 ? "#{@food[:meat]} (#{number_to_percentage(@food[:meat] / @food[:all].to_f * 100.0)})" : "0"
+      = (@food[:all] || 0) > 0 ? "#{@food[:meat]} (#{number_to_percentage(@food[:meat] / @food[:all].to_f * 100.0)})" : "0"
     = data_set(:h3, 'articles.admin.stats.headings.food.vegetarian') do
-      = @food && (@food[:all] || 0) > 0 ? "#{@food[:vegetarian]} (#{number_to_percentage(@food[:vegetarian] / @food[:all].to_f * 100.0)})" : "0"
+      = (@food[:all] || 0) > 0 ? "#{@food[:vegetarian]} (#{number_to_percentage(@food[:vegetarian] / @food[:all].to_f * 100.0)})" : "0"
     = data_set(:h3, 'articles.admin.stats.headings.food.vegan') do
-      = @food && (@food[:all] || 0) > 0 ? "#{@food[:vegan]} (#{number_to_percentage(@food[:vegan] / @food[:all].to_f * 100.0)})" : "0"
+      = (@food[:all] || 0) > 0 ? "#{@food[:vegan]} (#{number_to_percentage(@food[:vegan] / @food[:all].to_f * 100.0)})" : "0"
     = data_set(:h3, 'articles.admin.stats.headings.donation_count') do
       = (@completed_registrations || 0) > 0 ? "#{@donation_count} (#{number_to_percentage(@donation_count / @completed_registrations.to_f * 100.0)})" : "0"
     = data_set(:h3, 'articles.admin.stats.headings.donation_total') do
@@ -22,5 +22,5 @@
 = columns(medium: 12) do
   %h3=_'articles.admin.stats.headings.past_stats'
   %ul.actions.center
-    - (@past_conferences || []).each do |conference|
+    - @past_conferences.each do |conference|
       = link_to conference.title, previous_stats_path(@this_conference.slug, conference.slug, format: :xlsx), class: [:button, :download]

config/locales/en.yml

@@ -1375,7 +1375,7 @@ en:
         payment_message: Registration
         schedule_info: Schedule
         travel_info: Getting To %{city}
-        city_info: A little about %{city}
+        city_info: Weather and Crime in %{city}
         what_to_bring: What to Bring
         volunteering_info: Volunteering
         conferences: National and Regional Conferences
@@ -1797,7 +1797,7 @@ en:
         payment_form: Registration Fee Amount
         org_select: Which organization are you a member of?
         payment_type: Registration Fee Method
-        housing_other: Information for organizers
+        housing_other: Other considerations
         housing_allergies: Do you have any allergies?
         housing_food: What are your eating habits?
         housing_bike: Would you like to borrow a bike?
@@ -1952,10 +1952,10 @@ en:
           out of our own pockets. Otherwise, please pledge to pay on arrival. Your
           pledge will help us make a rough plan for what we can and cannot afford.
           Thank you.
-        housing_other: Please enter any information you would like organizers to consider
+        housing_other: Do you have any special needs or considerations that we should
-          when preparing for your visit. If you have restrictions in terms of mobility,
+          know about for your stay such as allergies, disabilities, or a need for
-          diet or allergies, or preferences on the accommodations or guests that we will
+          child care? Letting us know in advance will help us determine the best place
-          place you with, please list them here.
+          for you to stay and make any necessary preparations for the conference itself.
         housing_allergies: Let us know if you have any allergies that we should be
           made aware of.
         housing_food: Please let us know your eating habits by selecting the option
@@ -2445,8 +2445,8 @@ en:
         food_vegetarian: I am vegetarian
         food_vegan: I am vegan
         housing_none: I don't need a place to stay
-        housing_tent: I would like a tent spot
+        housing_tent: I would like a place to tent
-        housing_house: Yes, I would like a place to stay
+        housing_house: Yes, I would like to place to stay
         'yes': 'Yes'
         'no': 'No'
         maybe: Maybe

config/locales/es.yml

@@ -1384,7 +1384,7 @@ es:
         housing_companion_email: Correo electrónico de tu acompañante
         housing_departure_date: Fecha de partida
         housing_food: Cuáles son tus hábitos alimenticios?
-        housing_other: Información para organizadores
+        housing_other: Otras consideraciones
         housing_type: Hospedaje
         org_create_address: Dirección de tu organización
         org_create_email: Correo electrónico de tu organización
@@ -1567,10 +1567,12 @@ es:
           la opción que mejor describa el tipo de comida que comes. Usaremos esto
           para decidir el tipo de comidas que prepararemos y la cantidad de alimentos
           que necesitaremos.
-        housing_other: Ingrese cualquier información que le gustaría que los organizadores
+        housing_other: Tienes algún requerimiento especial o consideraciones que creas
-          consideren para su visita. Si tiene restricciones de movilidad, dieta o alergias,
+          que debamos tener respecto a tu estadía, tales como alergias, limitaciones
-          o preferencias de alojamiento (ej. preferencia de huéspedes para compartir
+          de movilidad o discapacidades, o si necesitas guardería? Hacérnoslo saber
-          alojamiento), indíquelos aquí por favor.
+          por adelantado nos ayudará a determinar mejor el lugar en el que te hospedarás
+          y si es necesario, preparar los mismos lugares en los que se realizará la
+          conferencia para tu mejor accesibilidad a ellos.
         housing_type: Necesitas un lugar para quedarte en %{city} ? Haremos lo posible
           por ubicarte con un(a) anfitrión(a) local y con lxs visitantes que mejor
           coincidan con tus necesidades. 

config/locales/fr.yml

@@ -1212,7 +1212,7 @@ fr:
         hosting_space_tent: Hébergement sous tente
         hosting_start_date: Date de début de l’hébergement
         housing_bike: Souhaitez-vous emprunter un vélo?
-        housing_other: Informations pour les organisateurs
+        housing_other: Autres précisions
         housing_type: Hébergement
         hosting_end_date: Date de fin de l’hébergement
         housing_companion_check: Hébergement pour deux personnes
@@ -1386,11 +1386,10 @@ fr:
         housing_food: Veuillez nous renseigner sur vos habitudes alimentaires en choisissant
           l'option qui vous correspond le mieux. Cela nous aidera à préparer de meilleurs
           repas et à prévoir des quantités de nourriture adaptées.
-        housing_other: "Merci d'indiquer toutes les informations que vous désirez porter à
+        housing_other: Avez-vous des besoins spéciaux ou d'autres besoins à prendre
-          l'attention des organisateurs, afin qu'elles puissent être prises en compte dans
+          en compte, tel que des allergies, des incapacités ou du gardiennage d'enfants?
-          l'organisation de votre séjour. Si vous avez des besoins en matière d'accessibilité,
+          Veuillez le préciser ici afin de nous aider à vous trouver un hébergement
-          un régime particulier ou des allergies, ou si vous avez des préférences concernant
+          adapté et à organiser le congrès.
-          votre hébergement et votre hôte : listez tout celà ici."
         housing_type: Avez-vous besoin d'un hébergement à %{city}? Nous ferons notre
           possible pour trouver des hébergements adaptés aux besoins de tous et de
           toutes.

features/support/factory_girl.rb

@@ -111,6 +111,10 @@ def create_registration(user = TestState.my_account)
     'group_ride' => true
   }
   registration.housing_data = { 'other' => '', 'companion' => false }
+  
+  registration.city_id = City.search('Los Angeles').id unless City.exists?(registration.city_id)
+  registration.data['city_id'] = City.search('Montreal').id unless City.exists?(registration.data['city_id'])
+
   registration.save!
 
   if user == TestState.my_account

features/support/location_cache.yml

@@ -1,51 +0,0 @@
----
-Brooklyn NY: !ruby/object:Geocoder::Result::Google
-  data:
-    address_components:
-    - long_name: Brooklyn
-      short_name: Brooklyn
-      types:
-      - political
-      - sublocality
-      - sublocality_level_1
-    - long_name: Kings County
-      short_name: Kings County
-      types:
-      - administrative_area_level_2
-      - political
-    - long_name: New York
-      short_name: NY
-      types:
-      - administrative_area_level_1
-      - political
-    - long_name: United States
-      short_name: US
-      types:
-      - country
-      - political
-    formatted_address: Brooklyn, NY, USA
-    geometry:
-      bounds:
-        northeast:
-          lat: 40.739446
-          lng: -73.8333651
-        southwest:
-          lat: 40.551042
-          lng: -74.05663
-      location:
-        lat: 40.6781784
-        lng: -73.9441579
-      location_type: APPROXIMATE
-      viewport:
-        northeast:
-          lat: 40.739446
-          lng: -73.8333651
-        southwest:
-          lat: 40.551042
-          lng: -74.05663
-    place_id: ChIJCSF8lBZEwokRhngABHRcdoI
-    types:
-    - political
-    - sublocality
-    - sublocality_level_1
-  cache_hit: