Project

General



Profile

« Previous | Next » 

Revision 2391

Fixes error messages translation.

View differences:

sandbox/rails-2.2/app/models/repository.rb
25 25
  before_destroy :clear_changesets
26 26
  
27 27
  # Checks if the SCM is enabled when creating a repository
28
  validate_on_create { |r| r.errors.add(:type, :activerecord_error_invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
28
  validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
29 29
  
30 30
  # Removes leading and trailing whitespace
31 31
  def url=(arg)
sandbox/rails-2.2/app/models/wiki_page.rb
129 129
  protected
130 130
  
131 131
  def validate
132
    errors.add(:parent_title, :activerecord_error_invalid) if !@parent_title.blank? && parent.nil?
133
    errors.add(:parent_title, :activerecord_error_circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
134
    errors.add(:parent_title, :activerecord_error_not_same_project) if parent && (parent.wiki_id != wiki_id)
132
    errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
133
    errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
134
    errors.add(:parent_title, :not_same_project) if parent && (parent.wiki_id != wiki_id)
135 135
  end
136 136
end
137 137

  
sandbox/rails-2.2/test/unit/issue_test.rb
47 47
    assert issue.available_custom_fields.include?(field)
48 48
    # No value for the custom field
49 49
    assert !issue.save
50
    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
50
    assert_equal I18n.translate('activerecord.errors.messages.invalid'), issue.errors.on(:custom_values)
51 51
    # Blank value
52 52
    issue.custom_field_values = { field.id => '' }
53 53
    assert !issue.save
54
    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
54
    assert_equal I18n.translate('activerecord.errors.messages.invalid'), issue.errors.on(:custom_values)
55 55
    # Invalid value
56 56
    issue.custom_field_values = { field.id => 'SQLServer' }
57 57
    assert !issue.save
58
    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
58
    assert_equal I18n.translate('activerecord.errors.messages.invalid'), issue.errors.on(:custom_values)
59 59
    # Valid value
60 60
    issue.custom_field_values = { field.id => 'PostgreSQL' }
61 61
    assert issue.save
sandbox/rails-2.2/test/unit/project_test.rb
42 42
    @ecookbook.name = ""
43 43
    assert !@ecookbook.save
44 44
    assert_equal 1, @ecookbook.errors.count
45
    assert_equal "activerecord_error_blank", @ecookbook.errors.on(:name)
45
    assert_equal I18n.translate('activerecord.errors.messages.blank'), @ecookbook.errors.on(:name)
46 46
  end
47 47
  
48 48
  def test_archive
sandbox/rails-2.2/test/unit/repository_test.rb
60 60
    Setting.enabled_scm = ['Darcs', 'Git']
61 61
    repository = Repository::Subversion.new(:project => Project.find(3), :url => "svn://localhost")
62 62
    assert !repository.save
63
    assert_equal :activerecord_error_invalid, repository.errors.on(:type)
63
    assert_equal I18n.translate('activerecord.errors.messages.invalid'), repository.errors.on(:type)
64 64
    # re-enable Subversion for following tests
65 65
    Setting.delete_all
66 66
  end
sandbox/rails-2.2/test/unit/user_test.rb
59 59
    u.login = 'newuser2'
60 60
    u.password, u.password_confirmation = "password", "password"
61 61
    assert !u.save
62
    assert_equal 'activerecord_error_taken', u.errors.on(:mail)
62
    assert_equal I18n.translate('activerecord.errors.messages.taken'), u.errors.on(:mail)
63 63
  end
64 64

  
65 65
  def test_update
sandbox/rails-2.2/test/unit/wiki_page_test.rb
78 78
    # A page that doesn't exist
79 79
    page.parent_title = 'Unknown title'
80 80
    assert !page.save
81
    assert_equal :activerecord_error_invalid, page.errors.on(:parent_title)
81
    assert_equal I18n.translate('activerecord.errors.messages.invalid'), page.errors.on(:parent_title)
82 82
    # A child page
83 83
    page.parent_title = 'Page_with_an_inline_image'
84 84
    assert !page.save
85
    assert_equal :activerecord_error_circular_dependency, page.errors.on(:parent_title)
85
    assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'), page.errors.on(:parent_title)
86 86
    # The page itself
87 87
    page.parent_title = 'CookBook_documentation'
88 88
    assert !page.save
89
    assert_equal :activerecord_error_circular_dependency, page.errors.on(:parent_title)
89
    assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'), page.errors.on(:parent_title)
90 90

  
91 91
    page.parent_title = 'Another_page'
92 92
    assert page.save

Also available in: Unified diff