Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some Typos Corrected and Queen's English -> American English Translations #1310

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions actionpack/lib/action_dispatch/testing/assertions/response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ def assert_redirected_to(options = {}, message=nil)
assert_response(:redirect, message)
return true if options == @response.location

redirected_to_after_normalisation = normalize_argument_to_redirection(@response.location)
options_after_normalisation = normalize_argument_to_redirection(options)
redirected_to_after_normalization = normalize_argument_to_redirection(@response.location)
options_after_normalization = normalize_argument_to_redirection(options)

if redirected_to_after_normalisation != options_after_normalisation
flunk "Expected response to be a redirect to <#{options_after_normalisation}> but was a redirect to <#{redirected_to_after_normalisation}>"
if redirected_to_after_normalization != options_after_normalization
flunk "Expected response to be a redirect to <#{options_after_normalization}> but was a redirect to <#{redirected_to_after_normalization}>"
end
end

Expand Down
4 changes: 2 additions & 2 deletions actionpack/test/controller/new_base/base_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module Submodule
class ContainedEmptyController < ActionController::Base ; end
class ContainedSubEmptyController < ContainedEmptyController ; end
class ContainedNonDefaultPathController < ActionController::Base
def self.controller_path; "i_am_extremly_not_default"; end
def self.controller_path; "i_am_extremely_not_default"; end
end
end

Expand Down Expand Up @@ -89,7 +89,7 @@ class BaseTest < Rack::TestCase
end

test "namespaced non-default controller path" do
assert_equal 'i_am_extremly_not_default', Submodule::ContainedNonDefaultPathController.controller_path
assert_equal 'i_am_extremely_not_default', Submodule::ContainedNonDefaultPathController.controller_path
assert_equal Submodule::ContainedNonDefaultPathController.controller_path, Submodule::ContainedNonDefaultPathController.new.controller_path
end

Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/associations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ def association_instance_set(name, association)
# the inverse of each other and the inverse of the +dungeon+ association on +EvilWizard+
# is the +evil_wizard+ association on +Dungeon+ (and vice-versa). By default,
# Active Record doesn't know anything about these inverse relationships and so no object
# loading optimisation is possible. For example:
# loading optimization is possible. For example:
#
# d = Dungeon.first
# t = d.traps.first
Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/named_scope.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module ClassMethods
# posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
#
# fruits = Fruit.scoped
# fruits = fruits.where(:colour => 'red') if options[:red_only]
# fruits = fruits.where(:color => 'red') if options[:red_only]
# fruits = fruits.limit(10) if limited?
#
# Anonymous \scopes tend to be useful when procedurally generating complex
Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/schema_dumper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def table(table, stream)
spec = {}
spec[:name] = column.name.inspect

# AR has an optimisation which handles zero-scale decimals as integers. This
# AR has an optimization which handles zero-scale decimals as integers. This
# code ensures that the dumper still dumps the column as a decimal.
spec[:type] = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
'decimal'
Expand Down
2 changes: 1 addition & 1 deletion activeresource/lib/active_resource/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ class << self
# attribute 'name', :string
#
# # or use the convenience methods and pass >=1 attribute names
# string 'eye_colour', 'hair_colour'
# string 'eye_color', 'hair_color'
# integer 'age'
# float 'height', 'weight'
#
Expand Down