Replaced "can't" with "cannot" in error messages.

git-svn-id: http://svn.redmine.org/redmine/trunk@13781 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 files changed, 19 insertions, 19 deletions

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