Skip to content

Commit def0c3e

Browse files
authored
Merge pull request #9674 from jrafanie/fix-typos
Fix typos in comments/strings in application helper and controller
2 parents e7ff077 + a862acf commit def0c3e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

app/controllers/application_controller.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def pp_options
8585

8686
TIMELINES_FOLDER = Rails.root.join("product", "timelines")
8787

88-
ONE_MILLION = 1_000_000 # Setting high number incase we don't want to display paging controls on list views
88+
ONE_MILLION = 1_000_000 # Setting high number in case we don't want to display paging controls on list views
8989

9090
PERPAGE_TYPES = %w[list reports].each_with_object({}) { |value, acc| acc[value] = value.to_sym }.freeze
9191

@@ -457,10 +457,10 @@ def log_depot_validate
457457

458458
begin
459459
if pfx == "pxe"
460-
msg = _('PXE Credentials successfuly validated')
460+
msg = _('PXE Credentials successfully validated')
461461
PxeServer.verify_depot_settings(settings)
462462
else
463-
msg = _('Depot Settings successfuly validated')
463+
msg = _('Depot Settings successfully validated')
464464
MiqSchedule.new.verify_file_depot(settings)
465465
end
466466
rescue StandardError => bang
@@ -1024,7 +1024,7 @@ def get_view_process_search_text(view)
10241024

10251025
# Don't apply sub_filter when viewing sub-list view of a CI.
10261026
# This applies when search is active and you go Vm -->
1027-
# {Processes,Users,...} in that case, search shoult NOT be applied.
1027+
# {Processes,Users,...} in that case, search should NOT be applied.
10281028
# If loading a form such as provisioning, don't filter records
10291029
# FIXME: This needs to be changed to apply search in some explicit way.
10301030
return nil if @display || @in_a_form
@@ -1973,7 +1973,7 @@ def clear_flash_msg
19731973
@flash_array = nil if params[:button] != "reset"
19741974
end
19751975

1976-
# Build all trees and accordions accoding to features available to the current user.
1976+
# Build all trees and accordions according to features available to the current user.
19771977

19781978
def build_accordions_and_trees_only
19791979
# Build the Explorer screen from scratch

app/helpers/application_helper/page_layouts.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def show_adv_search?
240240

241241
attr_reader :big_iframe
242242

243-
# a layout which gives full control over the center, but always provides the navbars and menus - to be overriden per-controller, used by v2v
243+
# a layout which gives full control over the center, but always provides the navbars and menus - to be overridden per-controller, used by v2v
244244
def layout_full_center
245245
nil
246246
end

0 commit comments

Comments
 (0)