Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 4604

Show
Ignore:
Timestamp:
07/10/06 19:41:59 (2 years ago)
Author:
bitsweat
Message:

occured -> occurred. Closes #5559.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activerecord/lib/active_record/base.rb

    r4596 r4604  
    18491849          self.class.read_methods.delete(attr_name) 
    18501850          if logger 
    1851             logger.warn "Exception occured during reader method compilation." 
     1851            logger.warn "Exception occurred during reader method compilation." 
    18521852            logger.warn "Maybe #{attr_name} is not a valid Ruby identifier?" 
    18531853            logger.warn "#{err.message}" 

  • trunk/activerecord/lib/active_record/fixtures.rb

    r4603 r4604  
    309309          end 
    310310        rescue Exception=>boom 
    311           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}" 
     311          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}" 
    312312        end 
    313313      elsif File.file?(csv_file_path) 

  • trunk/activesupport/lib/active_support/dependencies.rb

    r4136 r4604  
    164164  def describe_blame 
    165165    return nil if blamed_files.empty? 
    166     "This error occured while loading the following files:\n   #{blamed_files.join "\n   "}" 
     166    "This error occurred while loading the following files:\n   #{blamed_files.join "\n   "}" 
    167167  end 
    168168 

  • trunk/activesupport/lib/active_support/whiny_nil.rb

    r2602 r4604  
    3131      message = "You have a nil object when you didn't expect it!" 
    3232      message << "\nYou might have expected an instance of #{klass}." if klass 
    33       message << "\nThe error occured while evaluating nil.#{selector}" if selector 
     33      message << "\nThe error occurred while evaluating nil.#{selector}" if selector 
    3434       
    3535      raise NoMethodError, message, with_caller || caller