merge master

app/controllers/admin/booths_controller.rb

@@ -10,7 +10,7 @@ module Admin
       @booth_export_option = params[:booth_export_option]
       respond_to do |format|
         format.html
-        # Explicity call #to_json to avoid the use of EventSerializer
+        # Explicitly call #to_json to avoid the use of EventSerializer
         format.json { render json: Booth.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

app/controllers/admin/events_controller.rb

@@ -24,7 +24,7 @@ module Admin
 
       respond_to do |format|
         format.html
-        # Explicity call #to_json to avoid the use of EventSerializer
+        # Explicitly call #to_json to avoid the use of EventSerializer
         format.json { render json: Event.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

app/controllers/admin/tracks_controller.rb

@@ -15,7 +15,7 @@ module Admin
 
       respond_to do |format|
         format.html
-        # Explicity call #to_json to avoid the use of EventSerializer
+        # Explicitly call #to_json to avoid the use of EventSerializer
         format.json { render json: Track.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

app/controllers/application_controller.rb

@@ -53,7 +53,7 @@ class ApplicationController < ActionController::Base
     Rails.logger.debug('IChain Record was not Unique!')
     sign_out(current_user)
     redirect_to root_path,
-                error: 'Your E-Mail adress is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
+                error: 'Your E-Mail address is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
   end
 
   rescue_from UserDisabled do