summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-12-21 12:39:48 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-12-21 12:39:48 +0000
commit2a6692248b8976141997c4418561bb0800baf2da (patch)
tree68c7fe2afb20e1daa1790cdc3e61a06a53768ba9
parente2998505b2403a70c233cf96fac8432e950bf47d (diff)
downloadredmine-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
-rw-r--r--app/models/enumeration.rb2
-rw-r--r--app/models/role.rb4
-rw-r--r--app/models/tracker.rb2
-rw-r--r--config/locales/bs.yml2
-rw-r--r--config/locales/el.yml2
-rw-r--r--config/locales/en-GB.yml4
-rw-r--r--config/locales/en.yml4
-rw-r--r--config/locales/fi.yml2
-rw-r--r--config/locales/hr.yml2
-rw-r--r--config/locales/id.yml2
-rw-r--r--config/locales/lv.yml2
-rw-r--r--config/locales/mk.yml2
-rw-r--r--config/locales/mn.yml2
-rw-r--r--config/locales/ro.yml2
-rw-r--r--config/locales/th.yml2
-rw-r--r--config/locales/uk.yml2
-rw-r--r--test/functional/attachments_controller_test.rb2
-rw-r--r--test/functional/auth_sources_controller_test.rb4
-rw-r--r--test/functional/issue_statuses_controller_test.rb4
-rw-r--r--test/functional/issues_controller_test.rb12
-rw-r--r--test/functional/news_controller_test.rb4
-rw-r--r--test/functional/principal_memberships_controller_test.rb2
-rw-r--r--test/functional/projects_controller_test.rb2
-rw-r--r--test/functional/trackers_controller_test.rb4
-rw-r--r--test/functional/wiki_controller_test.rb2
-rw-r--r--test/functional/wikis_controller_test.rb2
-rw-r--r--test/integration/api_test/groups_test.rb4
-rw-r--r--test/integration/api_test/issue_categories_test.rb4
-rw-r--r--test/integration/api_test/issues_test.rb10
-rw-r--r--test/integration/api_test/memberships_test.rb6
-rw-r--r--test/integration/api_test/projects_test.rb4
-rw-r--r--test/integration/api_test/time_entries_test.rb4
-rw-r--r--test/integration/api_test/users_test.rb4
-rw-r--r--test/integration/api_test/versions_test.rb2
-rw-r--r--test/test_helper.rb6
-rw-r--r--test/unit/group_test.rb2
-rw-r--r--test/unit/issue_custom_field_test.rb2
-rw-r--r--test/unit/issue_status_test.rb2
-rw-r--r--test/unit/issue_test.rb10
-rw-r--r--test/unit/member_test.rb2
-rw-r--r--test/unit/query_test.rb2
-rw-r--r--test/unit/repository_bazaar_test.rb2
-rw-r--r--test/unit/repository_cvs_test.rb4
-rw-r--r--test/unit/repository_darcs_test.rb2
-rw-r--r--test/unit/repository_filesystem_test.rb2
-rw-r--r--test/unit/repository_git_test.rb2
-rw-r--r--test/unit/repository_mercurial_test.rb2
-rw-r--r--test/unit/repository_test.rb2
-rw-r--r--test/unit/time_entry_activity_test.rb4
49 files changed, 77 insertions, 83 deletions
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index 4540e9720..d69b34e6a 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -131,7 +131,7 @@ class Enumeration < ActiveRecord::Base
private
def check_integrity
- raise "Can't delete enumeration" if self.in_use?
+ raise "Cannot delete enumeration" if self.in_use?
end
end
diff --git a/app/models/role.rb b/app/models/role.rb
index 790b0426c..2db77a1a0 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -204,8 +204,8 @@ private
end
def check_deletable
- raise "Can't delete role" if members.any?
- raise "Can't delete builtin role" if builtin?
+ raise "Cannot delete role" if members.any?
+ raise "Cannot delete builtin role" if builtin?
end
def self.find_or_create_system_role(builtin, name)
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 4b86a7ecb..e5c789975 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -109,6 +109,6 @@ class Tracker < ActiveRecord::Base
private
def check_integrity
- raise Exception.new("Can't delete tracker") if Issue.where(:tracker_id => self.id).any?
+ raise Exception.new("Cannot delete tracker") if Issue.where(:tracker_id => self.id).any?
end
end
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 578afa83b..b006b06a2 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -915,7 +915,7 @@ bs:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 0a82dacba..577a52c75 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -902,7 +902,7 @@ el:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d241c67a1..c9d1b95d9 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -114,8 +114,8 @@ en-GB:
invalid: "is invalid"
confirmation: "doesn't match confirmation"
accepted: "must be accepted"
- empty: "can't be empty"
- blank: "can't be blank"
+ empty: "cannot be empty"
+ blank: "cannot be blank"
too_long: "is too long (maximum is %{count} characters)"
too_short: "is too short (minimum is %{count} characters)"
wrong_length: "is the wrong length (should be %{count} characters)"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fa33cc9de..919d77861 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -110,8 +110,8 @@ en:
invalid: "is invalid"
confirmation: "doesn't match confirmation"
accepted: "must be accepted"
- empty: "can't be empty"
- blank: "can't be blank"
+ empty: "cannot be empty"
+ blank: "cannot be blank"
too_long: "is too long (maximum is %{count} characters)"
too_short: "is too short (minimum is %{count} characters)"
wrong_length: "is the wrong length (should be %{count} characters)"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index fd57e5af2..4d5a606c0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -923,7 +923,7 @@ fi:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index ebd4bc9d8..a0dc1ac6d 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -903,7 +903,7 @@ hr:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/id.yml b/config/locales/id.yml
index d6c18d232..f3faf624e 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -906,7 +906,7 @@ id:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 4491793f6..72bc07173 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -895,7 +895,7 @@ lv:
field_parent_issue: Parent task
error_unable_delete_issue_status: Unable to delete issue status
label_subtask_plural: Apakšuzdevumi
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
label_project_copy_notifications: Send email notifications during the project copy
field_principal: Principal
label_my_page_block: My page block
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 355dbd512..b9472602b 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -182,7 +182,7 @@ mk:
error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
error_can_not_delete_custom_field: Unable to delete custom field
- error_can_not_delete_tracker: "This tracker contains issues and can't be deleted."
+ error_can_not_delete_tracker: "This tracker contains issues and cannot be deleted."
error_can_not_remove_role: "This role is in use and can not be deleted."
error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version can not be reopened'
error_can_not_archive_project: This project can not be archived
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 2d63929ff..5c8a8e385 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -903,7 +903,7 @@ mn:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index f0009dfe2..c267284e4 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -897,7 +897,7 @@ ro:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/th.yml b/config/locales/th.yml
index ce7a91870..490da0f03 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -899,7 +899,7 @@ th:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 13a7812d7..1411c0495 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -899,7 +899,7 @@ uk:
error_can_not_delete_custom_field: Unable to delete custom field
error_unable_to_connect: Unable to connect (%{value})
error_can_not_remove_role: This role is in use and can not be deleted.
- error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+ error_can_not_delete_tracker: This tracker contains issues and cannot be deleted.
field_principal: Principal
label_my_page_block: My page block
notice_failed_to_save_members: "Failed to save member(s): %{errors}."
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index d0fde7c27..981b7f64f 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -382,7 +382,7 @@ class AttachmentsControllerTest < ActionController::TestCase
assert_response :success
assert_template 'edit'
- assert_select_error /file #{ESCAPED_CANT} be blank/i
+ assert_select_error /file cannot be blank/i
# The other attachment should not be updated
attachment = Attachment.find(4)
diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index 5185d2c0e..357779a0e 100644
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_test.rb
@@ -74,7 +74,7 @@ class AuthSourcesControllerTest < ActionController::TestCase
assert_response :success
assert_template 'new'
end
- assert_select_error /host #{ESCAPED_CANT} be blank/i
+ assert_select_error /host cannot be blank/i
end
def test_edit
@@ -118,7 +118,7 @@ class AuthSourcesControllerTest < ActionController::TestCase
:port => '389', :attr_login => 'uid'}
assert_response :success
assert_template 'edit'
- assert_select_error /host #{ESCAPED_CANT} be blank/i
+ assert_select_error /host cannot be blank/i
end
def test_destroy
diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb
index a35244759..eca9b2009 100644
--- a/test/functional/issue_statuses_controller_test.rb
+++ b/test/functional/issue_statuses_controller_test.rb
@@ -62,7 +62,7 @@ class IssueStatusesControllerTest < ActionController::TestCase
post :create, :issue_status => {:name => ''}
assert_response :success
assert_template 'new'
- assert_select_error /name #{ESCAPED_CANT} be blank/i
+ assert_select_error /name cannot be blank/i
end
def test_edit
@@ -82,7 +82,7 @@ class IssueStatusesControllerTest < ActionController::TestCase
put :update, :id => '3', :issue_status => {:name => ''}
assert_response :success
assert_template 'edit'
- assert_select_error /name #{ESCAPED_CANT} be blank/i
+ assert_select_error /name cannot be blank/i
end
def test_destroy
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 3596a08cc..3b334a644 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1958,7 +1958,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'new'
issue = assigns(:issue)
assert_not_nil issue
- assert_select_error /Database #{ESCAPED_CANT} be blank/
+ assert_select_error /Database cannot be blank/
end
def test_create_should_validate_required_fields
@@ -1982,8 +1982,8 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'new'
end
- assert_select_error /Due date #{ESCAPED_CANT} be blank/i
- assert_select_error /Bar #{ESCAPED_CANT} be blank/i
+ assert_select_error /Due date cannot be blank/i
+ assert_select_error /Bar cannot be blank/i
end
def test_create_should_ignore_readonly_fields
@@ -3201,7 +3201,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success
assert_template 'edit'
- assert_select_error /Activity #{ESCAPED_CANT} be blank/
+ assert_select_error /Activity cannot be blank/
assert_select 'textarea[name=?]', 'issue[notes]', :text => notes
assert_select 'input[name=?][value=?]', 'time_entry[hours]', '2z'
end
@@ -3219,8 +3219,8 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success
assert_template 'edit'
- assert_select_error /Activity #{ESCAPED_CANT} be blank/
- assert_select_error /Hours #{ESCAPED_CANT} be blank/
+ assert_select_error /Activity cannot be blank/
+ assert_select_error /Hours cannot be blank/
assert_select 'textarea[name=?]', 'issue[notes]', :text => notes
assert_select 'input[name=?][value=?]', 'time_entry[comments]', 'this is my comment'
end
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 8dfa9cf42..377f10552 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -129,7 +129,7 @@ class NewsControllerTest < ActionController::TestCase
assert_template 'new'
assert_not_nil assigns(:news)
assert assigns(:news).new_record?
- assert_select_error /title #{ESCAPED_CANT} be blank/i
+ assert_select_error /title cannot be blank/i
end
def test_get_edit
@@ -166,7 +166,7 @@ class NewsControllerTest < ActionController::TestCase
put :update, :id => 1, :news => { :description => '' }
assert_response :success
assert_template 'edit'
- assert_select_error /description #{ESCAPED_CANT} be blank/i
+ assert_select_error /description cannot be blank/i
end
def test_destroy
diff --git a/test/functional/principal_memberships_controller_test.rb b/test/functional/principal_memberships_controller_test.rb
index 7d15114b2..d02c13450 100644
--- a/test/functional/principal_memberships_controller_test.rb
+++ b/test/functional/principal_memberships_controller_test.rb
@@ -104,7 +104,7 @@ class PrincipalMembershipsControllerTest < ActionController::TestCase
assert_equal 'text/javascript', response.content_type
end
assert_include 'alert', response.body, "Alert message not sent"
- assert_include 'Role can\\\'t be empty', response.body, "Error message not sent"
+ assert_include 'Role cannot be empty', response.body, "Error message not sent"
end
def test_update_user_membership
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index abf862e2e..42c6ff747 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -445,7 +445,7 @@ class ProjectsControllerTest < ActionController::TestCase
post :update, :id => 1, :project => {:name => ''}
assert_response :success
assert_template 'settings'
- assert_select_error /name #{ESCAPED_CANT} be blank/i
+ assert_select_error /name cannot be blank/i
end
def test_update_should_be_denied_for_member_on_closed_project
diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
index e69700dfc..0f7b1c4b0 100644
--- a/test/functional/trackers_controller_test.rb
+++ b/test/functional/trackers_controller_test.rb
@@ -89,7 +89,7 @@ class TrackersControllerTest < ActionController::TestCase
end
assert_response :success
assert_template 'new'
- assert_select_error /name #{ESCAPED_CANT} be blank/i
+ assert_select_error /name cannot be blank/i
end
def test_edit
@@ -147,7 +147,7 @@ class TrackersControllerTest < ActionController::TestCase
put :update, :id => 1, :tracker => { :name => '' }
assert_response :success
assert_template 'edit'
- assert_select_error /name #{ESCAPED_CANT} be blank/i
+ assert_select_error /name cannot be blank/i
end
def test_move_lower
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 5e1b19034..95c673c0b 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -928,7 +928,7 @@ class WikiControllerTest < ActionController::TestCase
end
def test_edit_protected_page_by_nonmember
- # Non members can't edit protected wiki pages
+ # Non members cannot edit protected wiki pages
@request.session[:user_id] = 4
get :edit, :project_id => 1, :id => 'CookBook_documentation'
assert_response 403
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index 69c632801..0a34f5d28 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -51,7 +51,7 @@ class WikisControllerTest < ActionController::TestCase
end
assert_include 'errorExplanation', response.body
- assert_include "Start page #{ESCAPED_CANT} be blank", response.body
+ assert_include "Start page cannot be blank", response.body
end
def test_update
diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb
index 1efeaaa21..2fe8271b1 100644
--- a/test/integration/api_test/groups_test.rb
+++ b/test/integration/api_test/groups_test.rb
@@ -144,7 +144,7 @@ class Redmine::ApiTest::GroupsTest < Redmine::ApiTest::Base
assert_equal 'application/xml', response.content_type
assert_select 'errors' do
- assert_select 'error', :text => /Name can't be blank/
+ assert_select 'error', :text => /Name cannot be blank/
end
end
@@ -164,7 +164,7 @@ class Redmine::ApiTest::GroupsTest < Redmine::ApiTest::Base
assert_equal 'application/xml', response.content_type
assert_select 'errors' do
- assert_select 'error', :text => /Name can't be blank/
+ assert_select 'error', :text => /Name cannot be blank/
end
end
diff --git a/test/integration/api_test/issue_categories_test.rb b/test/integration/api_test/issue_categories_test.rb
index c83b32961..9af14cd1a 100644
--- a/test/integration/api_test/issue_categories_test.rb
+++ b/test/integration/api_test/issue_categories_test.rb
@@ -57,7 +57,7 @@ class Redmine::ApiTest::IssueCategoriesTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Name can't be blank"
+ assert_select 'errors error', :text => "Name cannot be blank"
end
test "PUT /issue_categories/:id.xml with valid parameters should update the issue category" do
@@ -76,7 +76,7 @@ class Redmine::ApiTest::IssueCategoriesTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Name can't be blank"
+ assert_select 'errors error', :text => "Name cannot be blank"
end
test "DELETE /issue_categories/:id.xml should destroy the issue category" do
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index ba8dbc6b2..161beee67 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -90,7 +90,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Start date can't be blank"
+ assert_select 'errors error', :text => "Start date cannot be blank"
end
test "GET /issues.xml with custom field filter" do
@@ -361,7 +361,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
post '/issues.xml', {:issue => {:project_id => 1}}, credentials('jsmith')
end
- assert_select 'errors error', :text => "Subject can't be blank"
+ assert_select 'errors error', :text => "Subject cannot be blank"
end
test "POST /issues.json should create an issue with the attributes" do
@@ -385,7 +385,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
end
json = ActiveSupport::JSON.decode(response.body)
- assert json['errors'].include?("Subject can't be blank")
+ assert json['errors'].include?("Subject cannot be blank")
end
test "PUT /issues/:id.xml" do
@@ -444,7 +444,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
put '/issues/6.xml', {:issue => {:subject => ''}}, credentials('jsmith')
assert_response :unprocessable_entity
- assert_select 'errors error', :text => "Subject can't be blank"
+ assert_select 'errors error', :text => "Subject cannot be blank"
end
test "PUT /issues/:id.json" do
@@ -468,7 +468,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
json = ActiveSupport::JSON.decode(response.body)
- assert json['errors'].include?("Subject can't be blank")
+ assert json['errors'].include?("Subject cannot be blank")
end
test "DELETE /issues/:id.xml" do
diff --git a/test/integration/api_test/memberships_test.rb b/test/integration/api_test/memberships_test.rb
index aecd90aca..9313cf759 100644
--- a/test/integration/api_test/memberships_test.rb
+++ b/test/integration/api_test/memberships_test.rb
@@ -85,7 +85,7 @@ class Redmine::ApiTest::MembershipsTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Principal can't be blank"
+ assert_select 'errors error', :text => "Principal cannot be blank"
end
end
@@ -133,7 +133,7 @@ class Redmine::ApiTest::MembershipsTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Role can't be empty"
+ assert_select 'errors error', :text => "Role cannot be empty"
end
test "DELETE /memberships/:id.xml should destroy the membership" do
@@ -148,7 +148,7 @@ class Redmine::ApiTest::MembershipsTest < Redmine::ApiTest::Base
test "DELETE /memberships/:id.xml should respond with 422 on failure" do
assert_no_difference 'Member.count' do
- # A membership with an inherited role can't be deleted
+ # A membership with an inherited role cannot be deleted
Member.find(2).member_roles.first.update_attribute :inherited_from, 99
delete '/memberships/2.xml', {}, credentials('jsmith')
diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb
index dd25d2101..2bc4da278 100644
--- a/test/integration/api_test/projects_test.rb
+++ b/test/integration/api_test/projects_test.rb
@@ -179,7 +179,7 @@ class Redmine::ApiTest::ProjectsTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Identifier can't be blank"
+ assert_select 'errors error', :text => "Identifier cannot be blank"
end
test "PUT /projects/:id.xml with valid parameters should update the project" do
@@ -220,7 +220,7 @@ class Redmine::ApiTest::ProjectsTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Name can't be blank"
+ assert_select 'errors error', :text => "Name cannot be blank"
end
test "DELETE /projects/:id.xml should delete the project" do
diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb
index b118ed72f..492ecad0b 100644
--- a/test/integration/api_test/time_entries_test.rb
+++ b/test/integration/api_test/time_entries_test.rb
@@ -102,7 +102,7 @@ class Redmine::ApiTest::TimeEntriesTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Hours can't be blank"
+ assert_select 'errors error', :text => "Hours cannot be blank"
end
test "PUT /time_entries/:id.xml with valid parameters should update time entry" do
@@ -121,7 +121,7 @@ class Redmine::ApiTest::TimeEntriesTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "Hours can't be blank"
+ assert_select 'errors error', :text => "Hours cannot be blank"
end
test "DELETE /time_entries/:id.xml should destroy time entry" do
diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index beadc54c6..b0b0f6258 100644
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -183,7 +183,7 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "First name can't be blank"
+ assert_select 'errors error', :text => "First name cannot be blank"
end
test "POST /users.json with with invalid parameters should return errors" do
@@ -253,7 +253,7 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
assert_response :unprocessable_entity
assert_equal 'application/xml', @response.content_type
- assert_select 'errors error', :text => "First name can't be blank"
+ assert_select 'errors error', :text => "First name cannot be blank"
end
test "PUT /users/:id.json with invalid parameters" do
diff --git a/test/integration/api_test/versions_test.rb b/test/integration/api_test/versions_test.rb
index a53c29b07..2b04236d4 100644
--- a/test/integration/api_test/versions_test.rb
+++ b/test/integration/api_test/versions_test.rb
@@ -94,7 +94,7 @@ class Redmine::ApiTest::VersionsTest < Redmine::ApiTest::Base
end
assert_response :unprocessable_entity
- assert_select 'errors error', :text => "Name can't be blank"
+ assert_select 'errors error', :text => "Name cannot be blank"
end
test "GET /versions/:id.xml should return the version" do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 2416609a6..44ea86f5b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -44,12 +44,6 @@ class ActiveSupport::TestCase
self.use_transactional_fixtures = true
self.use_instantiated_fixtures = false
- #ESCAPED_CANT = 'can&#x27;t'
- #ESCAPED_UCANT = 'Can&#x27;t'
- # Rails 4.0.2
- ESCAPED_CANT = 'can&#39;t'
- ESCAPED_UCANT = 'Can&#39;t'
-
def uploaded_test_file(name, mime)
fixture_file_upload("files/#{name}", mime, true)
end
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"}