Change all "can not"s to the correct "cannot"
It's been 6 years since [the original](https://github.com/rails/rails/pull/13584), so we're overdue for a sequel. The correct word is "cannot", one word, not "can not", two words.
This commit is contained in:
parent
a7104fa44c
commit
6af50a9067
|
@ -19,7 +19,7 @@ module ActiveRecord
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
# Custom preload scope is used and
|
# Custom preload scope is used and
|
||||||
# the association can not be marked as loaded
|
# the association cannot be marked as loaded
|
||||||
# Loading into a Hash instead
|
# Loading into a Hash instead
|
||||||
records_by_owner
|
records_by_owner
|
||||||
end
|
end
|
||||||
|
|
|
@ -64,7 +64,7 @@ module ActiveSupport
|
||||||
def transliterate(string, replacement = "?", locale: nil)
|
def transliterate(string, replacement = "?", locale: nil)
|
||||||
string = string.dup if string.frozen?
|
string = string.dup if string.frozen?
|
||||||
raise ArgumentError, "Can only transliterate strings. Received #{string.class.name}" unless string.is_a?(String)
|
raise ArgumentError, "Can only transliterate strings. Received #{string.class.name}" unless string.is_a?(String)
|
||||||
raise ArgumentError, "Can not transliterate strings with #{string.encoding} encoding" unless ALLOWED_ENCODINGS_FOR_TRANSLITERATE.include?(string.encoding)
|
raise ArgumentError, "Cannot transliterate strings with #{string.encoding} encoding" unless ALLOWED_ENCODINGS_FOR_TRANSLITERATE.include?(string.encoding)
|
||||||
|
|
||||||
input_encoding = string.encoding
|
input_encoding = string.encoding
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ class TransliterateTest < ActiveSupport::TestCase
|
||||||
exception = assert_raises ArgumentError do
|
exception = assert_raises ArgumentError do
|
||||||
ActiveSupport::Inflector.transliterate(string)
|
ActiveSupport::Inflector.transliterate(string)
|
||||||
end
|
end
|
||||||
assert_equal "Can not transliterate strings with #{encoding} encoding", exception.message
|
assert_equal "Cannot transliterate strings with #{encoding} encoding", exception.message
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue