diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-21 12:39:48 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-21 12:39:48 +0000 |
commit | 2a6692248b8976141997c4418561bb0800baf2da (patch) | |
tree | 68c7fe2afb20e1daa1790cdc3e61a06a53768ba9 /test/unit | |
parent | e2998505b2403a70c233cf96fac8432e950bf47d (diff) | |
download | redmine-2a6692248b8976141997c4418561bb0800baf2da.tar.gz redmine-2a6692248b8976141997c4418561bb0800baf2da.zip |
Replaced "can't" with "cannot" in error messages.
git-svn-id: http://svn.redmine.org/redmine/trunk@13781 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/group_test.rb | 2 | ||||
-rw-r--r-- | test/unit/issue_custom_field_test.rb | 2 | ||||
-rw-r--r-- | test/unit/issue_status_test.rb | 2 | ||||
-rw-r--r-- | test/unit/issue_test.rb | 10 | ||||
-rw-r--r-- | test/unit/member_test.rb | 2 | ||||
-rw-r--r-- | test/unit/query_test.rb | 2 | ||||
-rw-r--r-- | test/unit/repository_bazaar_test.rb | 2 | ||||
-rw-r--r-- | test/unit/repository_cvs_test.rb | 4 | ||||
-rw-r--r-- | test/unit/repository_darcs_test.rb | 2 | ||||
-rw-r--r-- | test/unit/repository_filesystem_test.rb | 2 | ||||
-rw-r--r-- | test/unit/repository_git_test.rb | 2 | ||||
-rw-r--r-- | test/unit/repository_mercurial_test.rb | 2 | ||||
-rw-r--r-- | test/unit/repository_test.rb | 2 | ||||
-rw-r--r-- | test/unit/time_entry_activity_test.rb | 4 |
14 files changed, 20 insertions, 20 deletions
diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb index 6989680ec..6ddaa7ead 100644 --- a/test/unit/group_test.rb +++ b/test/unit/group_test.rb @@ -47,7 +47,7 @@ class GroupTest < ActiveSupport::TestCase set_language_if_valid 'en' g = Group.new assert !g.save - assert_include "Name can't be blank", g.errors.full_messages + assert_include "Name cannot be blank", g.errors.full_messages end def test_blank_name_error_message_fr diff --git a/test/unit/issue_custom_field_test.rb b/test/unit/issue_custom_field_test.rb index 28b6ecb92..22bd16e0e 100644 --- a/test/unit/issue_custom_field_test.rb +++ b/test/unit/issue_custom_field_test.rb @@ -26,7 +26,7 @@ class IssueCustomFieldTest < ActiveSupport::TestCase set_language_if_valid 'en' field = IssueCustomField.new(:name => 'Field', :field_format => 'string', :visible => false) assert !field.save - assert_include "Roles can't be blank", field.errors.full_messages + assert_include "Roles cannot be blank", field.errors.full_messages field.role_ids = [1, 2] assert field.save end diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb index 9ed2b9ae1..34434a569 100644 --- a/test/unit/issue_status_test.rb +++ b/test/unit/issue_status_test.rb @@ -50,7 +50,7 @@ class IssueStatusTest < ActiveSupport::TestCase def test_destroy_status_in_use # Status assigned to an Issue status = Issue.find(1).status - assert_raise(RuntimeError, "Can't delete status") { status.destroy } + assert_raise(RuntimeError, "Cannot delete status") { status.destroy } end def test_new_statuses_allowed_to diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index e4edb6acd..e654dfeac 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -136,11 +136,11 @@ class IssueTest < ActiveSupport::TestCase assert issue.available_custom_fields.include?(field) # No value for the custom field assert !issue.save - assert_equal ["Database can't be blank"], issue.errors.full_messages + assert_equal ["Database cannot be blank"], issue.errors.full_messages # Blank value issue.custom_field_values = { field.id => '' } assert !issue.save - assert_equal ["Database can't be blank"], issue.errors.full_messages + assert_equal ["Database cannot be blank"], issue.errors.full_messages # Invalid value issue.custom_field_values = { field.id => 'SQLServer' } assert !issue.save @@ -826,13 +826,13 @@ class IssueTest < ActiveSupport::TestCase assert_equal [cf.id.to_s, "category_id", "due_date"], issue.required_attribute_names(user).sort assert !issue.save, "Issue was saved" - assert_equal ["Category can't be blank", "Due date can't be blank", "Foo can't be blank"], + assert_equal ["Category cannot be blank", "Due date cannot be blank", "Foo cannot be blank"], issue.errors.full_messages.sort issue.tracker_id = 2 assert_equal [cf.id.to_s, "start_date"], issue.required_attribute_names(user).sort assert !issue.save, "Issue was saved" - assert_equal ["Foo can't be blank", "Start date can't be blank"], + assert_equal ["Foo cannot be blank", "Start date cannot be blank"], issue.errors.full_messages.sort issue.start_date = Date.today @@ -850,7 +850,7 @@ class IssueTest < ActiveSupport::TestCase issue = Issue.new(:project_id => 1, :tracker_id => 1, :status_id => 1, :subject => 'Required fields', :author => user) assert !issue.save - assert_include "Start date can't be blank", issue.errors.full_messages + assert_include "Start date cannot be blank", issue.errors.full_messages tracker = Tracker.find(1) tracker.core_fields -= %w(start_date) diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index f45824ce9..161ddfc14 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -65,7 +65,7 @@ class MemberTest < ActiveSupport::TestCase def test_validate member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2]) - # same use can't have more than one membership for a project + # same use cannot have more than one membership for a project assert !member.save # must have one role at least diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index ebe33aa1f..729cedef2 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -37,7 +37,7 @@ class QueryTest < ActiveSupport::TestCase set_language_if_valid 'en' query = IssueQuery.new(:name => 'Query', :visibility => IssueQuery::VISIBILITY_ROLES) assert !query.save - assert_include "Roles can't be blank", query.errors.full_messages + assert_include "Roles cannot be blank", query.errors.full_messages query.role_ids = [1, 2] assert query.save end diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb index 40f281582..d8255166d 100644 --- a/test/unit/repository_bazaar_test.rb +++ b/test/unit/repository_bazaar_test.rb @@ -63,7 +63,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase :log_encoding => 'UTF-8' ) assert !repo.save - assert_include "Path to repository can't be blank", + assert_include "Path to repository cannot be blank", repo.errors.full_messages end diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb index fec41329a..a412bde5c 100644 --- a/test/unit/repository_cvs_test.rb +++ b/test/unit/repository_cvs_test.rb @@ -46,7 +46,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase :root_url => REPOSITORY_PATH ) assert !repo.save - assert_include "Module can't be blank", + assert_include "Module cannot be blank", repo.errors.full_messages end @@ -74,7 +74,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase :url => MODULE_NAME ) assert !repo.save - assert_include "CVSROOT can't be blank", + assert_include "CVSROOT cannot be blank", repo.errors.full_messages end diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb index 9e98b0f2c..7e5610362 100644 --- a/test/unit/repository_darcs_test.rb +++ b/test/unit/repository_darcs_test.rb @@ -43,7 +43,7 @@ class RepositoryDarcsTest < ActiveSupport::TestCase :log_encoding => 'UTF-8' ) assert !repo.save - assert_include "Path to repository can't be blank", + assert_include "Path to repository cannot be blank", repo.errors.full_messages end diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb index dd6546518..878bd20a9 100644 --- a/test/unit/repository_filesystem_test.rb +++ b/test/unit/repository_filesystem_test.rb @@ -41,7 +41,7 @@ class RepositoryFilesystemTest < ActiveSupport::TestCase :identifier => 'test' ) assert !repo.save - assert_include "Root directory can't be blank", + assert_include "Root directory cannot be blank", repo.errors.full_messages end diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index 94e5747cc..15e26d194 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -56,7 +56,7 @@ class RepositoryGitTest < ActiveSupport::TestCase :identifier => 'test' ) assert !repo.save - assert_include "Path to repository can't be blank", + assert_include "Path to repository cannot be blank", repo.errors.full_messages end diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index 0518055a2..34fc2bee7 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -45,7 +45,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase :identifier => 'test' ) assert !repo.save - assert_include "Path to repository can't be blank", + assert_include "Path to repository cannot be blank", repo.errors.full_messages end diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index c89e20c11..75dbafe5b 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -48,7 +48,7 @@ class RepositoryTest < ActiveSupport::TestCase :log_encoding => '' ) assert !repo.save - assert_include "Commit messages encoding can't be blank", + assert_include "Commit messages encoding cannot be blank", repo.errors.full_messages end diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb index 1e7329e71..df057eae7 100644 --- a/test/unit/time_entry_activity_test.rb +++ b/test/unit/time_entry_activity_test.rb @@ -59,7 +59,7 @@ class TimeEntryActivityTest < ActiveSupport::TestCase e = TimeEntryActivity.new(:name => 'Custom Data') assert !e.save - assert_equal ["Billable can't be blank"], e.errors.full_messages + assert_equal ["Billable cannot be blank"], e.errors.full_messages end def test_create_with_required_custom_field_should_succeed @@ -83,7 +83,7 @@ class TimeEntryActivityTest < ActiveSupport::TestCase # Blanking custom field, save should fail e.custom_field_values = {field.id => ""} assert !e.save - assert_equal ["Billable can't be blank"], e.errors.full_messages + assert_equal ["Billable cannot be blank"], e.errors.full_messages # Update custom field to valid value, save should succeed e.custom_field_values = {field.id => "0"} |