From ae98ac1430baa690f744d850a985f63e5e9bd3cc Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 30 Oct 2020 18:06:43 +0900 Subject: [PATCH] Fixed some typos (#2695) * Fix typos --- app/controllers/admin/booths_controller.rb | 2 +- app/controllers/admin/events_controller.rb | 2 +- app/controllers/admin/tracks_controller.rb | 2 +- app/controllers/application_controller.rb | 2 +- app/helpers/application_helper.rb | 2 +- lib/tasks/events_registrations.rake | 2 +- spec/features/versions_spec.rb | 2 +- spec/models/conference_spec.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/booths_controller.rb b/app/controllers/admin/booths_controller.rb index b33ec103..dd4e5844 100644 --- a/app/controllers/admin/booths_controller.rb +++ b/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\"" diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index d8e9c1c9..9db4a438 100644 --- a/app/controllers/admin/events_controller.rb +++ b/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\"" diff --git a/app/controllers/admin/tracks_controller.rb b/app/controllers/admin/tracks_controller.rb index a4f4c69e..511a4fa9 100644 --- a/app/controllers/admin/tracks_controller.rb +++ b/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\"" diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c15681aa..93105587 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -52,7 +52,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 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9e27c1a5..24c08d0e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -69,7 +69,7 @@ module ApplicationHelper Comment.accessible_by(current_ability).find_since_last_login(user) end - # Recieves a PaperTrail::Version object + # Receives a PaperTrail::Version object # Outputs the list of attributes that were changed in the version (ignoring changes from one blank value to another) # Eg: If version.changeset = '{"title"=>[nil, "Premium"], "description"=>[nil, "Premium = Super cool"], "conference_id"=>[nil, 3]}' # Output will be 'title, description and conference' diff --git a/lib/tasks/events_registrations.rake b/lib/tasks/events_registrations.rake index a8f83360..171f4b25 100644 --- a/lib/tasks/events_registrations.rake +++ b/lib/tasks/events_registrations.rake @@ -1,7 +1,7 @@ # frozen_string_literal: true namespace :events_registrations do - desc "Deletes dupicate entries" + desc "Deletes duplicate entries" task deduplicate: :environment do if ActiveRecord::Migrator.get_all_versions.include? 20160403214841 duplicates = EventsRegistration.all.map { |er| er.id if er.valid? == false}.compact diff --git a/spec/features/versions_spec.rb b/spec/features/versions_spec.rb index ec443fd0..655d8322 100644 --- a/spec/features/versions_spec.rb +++ b/spec/features/versions_spec.rb @@ -376,7 +376,7 @@ feature 'Version' do EventsRegistration.create(registration: registration, event: event) EventsRegistration.first.update_attributes(attended: true) EventsRegistration.last.destroy - # Here registration is deleted to ensure the event registration related change still displays the asociated user's name + # Here registration is deleted to ensure the event registration related change still displays the associated user's name registration.destroy visit admin_revision_history_path diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb index 81e7d406..64cc1aea 100755 --- a/spec/models/conference_spec.rb +++ b/spec/models/conference_spec.rb @@ -165,7 +165,7 @@ describe Conference do end describe '#get_submissions_data' do - it 'returns emtpy hash if there is no cfp or events' do + it 'returns empty hash if there is no cfp or events' do expect(subject.get_submissions_data).to eq [] end