Merge remote-tracking branch 'upstream/pull/3061'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 68517bee69ac41a58e1fe023d065abb3558cf35e..24f2348c160d150457b5c221c69ecd92995ed8cb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1281,7 +1281,7 @@ en:
         open: Open
         resolved: Resolved
     update:
-      new_report: Your report has been registered sucessfully
+      new_report: Your report has been registered successfully
       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     show:
@@ -1352,7 +1352,7 @@ en:
           abusive_label: This note is abusive
           other_label: Other
     create:
-      successful_report: Your report has been registered sucessfully
+      successful_report: Your report has been registered successfully
       provide_details: Please provide the required details
   layouts:
     project_name:

diff --git a/test/system/report_diary_comment_test.rb b/test/system/report_diary_comment_test.rb
index 61879a32f0b3961ecd1ad7d69df9614e6d311539..a8027de790c2c29bffcf639e96a1604a65385af5 100644 (file)
--- a/test/system/report_diary_comment_test.rb
+++ b/test/system/report_diary_comment_test.rb
@@ -29,7 +29,7 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal @comment, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role

diff --git a/test/system/report_diary_entry_test.rb b/test/system/report_diary_entry_test.rb
index 9d232f8d465f2797a8a5917c603ec7248dc22251..11a8c2e9194119921b11f2e0a205d2493040747a 100644 (file)
--- a/test/system/report_diary_entry_test.rb
+++ b/test/system/report_diary_entry_test.rb
@@ -28,7 +28,7 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal @diary_entry, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role

diff --git a/test/system/report_note_test.rb b/test/system/report_note_test.rb
index 93e73cf5aaf7885f01063a8cd48ec91859748588..e45a4e702bbb1a1735e2a3c13e9324de560c6d52 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -24,7 +24,7 @@ class ReportNoteTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal note, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
@@ -45,7 +45,7 @@ class ReportNoteTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal note, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role

diff --git a/test/system/report_user_test.rb b/test/system/report_user_test.rb
index 7b49f2997109b4e3738f5e553609718ba8519d61..5bdf3c201c4914b0490e521f98e8d7f384ef476f 100644 (file)
--- a/test/system/report_user_test.rb
+++ b/test/system/report_user_test.rb
@@ -24,7 +24,7 @@ class ReportUserTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal user, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
@@ -45,7 +45,7 @@ class ReportUserTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal user, Issue.last.reportable
     assert_equal "moderator", Issue.last.assigned_role
@@ -62,7 +62,7 @@ class ReportUserTest < ApplicationSystemTestCase
       click_on "Create Report"
     end
 
-    assert page.has_content? "Your report has been registered sucessfully"
+    assert page.has_content? "Your report has been registered successfully"
 
     assert_equal user, Issue.last.reportable
     assert_equal "administrator", Issue.last.assigned_role