Permalink
Browse files

occured -> occurred. Closes #5559.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4604 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a72ace1 commit f0c22d4ad5c61e7e683291fd42e143d1a339c3a2 @jeremy jeremy committed Jul 10, 2006
View
2 activerecord/lib/active_record/base.rb
@@ -1848,7 +1848,7 @@ def evaluate_read_method(attr_name, method_definition)
rescue SyntaxError => err
self.class.read_methods.delete(attr_name)
if logger
- logger.warn "Exception occured during reader method compilation."
+ logger.warn "Exception occurred during reader method compilation."
logger.warn "Maybe #{attr_name} is not a valid Ruby identifier?"
logger.warn "#{err.message}"
end
View
2 activerecord/lib/active_record/fixtures.rb
@@ -308,7 +308,7 @@ def read_fixture_files
end
end
rescue Exception=>boom
- raise Fixture::FormatError, "a YAML error occured parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{boom.class}: #{boom}"
+ raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{boom.class}: #{boom}"
end
elsif File.file?(csv_file_path)
# CSV fixtures
View
4 activesupport/lib/active_support/dependencies.rb
@@ -163,11 +163,11 @@ def blamed_files
def describe_blame
return nil if blamed_files.empty?
- "This error occured while loading the following files:\n #{blamed_files.join "\n "}"
+ "This error occurred while loading the following files:\n #{blamed_files.join "\n "}"
end
def copy_blame!(exc)
@blamed_files = exc.blamed_files.clone
self
end
-end
+end
View
2 activesupport/lib/active_support/whiny_nil.rb
@@ -30,7 +30,7 @@ def method_missing(method, *args, &block)
def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil)
message = "You have a nil object when you didn't expect it!"
message << "\nYou might have expected an instance of #{klass}." if klass
- message << "\nThe error occured while evaluating nil.#{selector}" if selector
+ message << "\nThe error occurred while evaluating nil.#{selector}" if selector
raise NoMethodError, message, with_caller || caller
end

0 comments on commit f0c22d4

Please sign in to comment.