Merge pull request #1723 from LadyOscar/issue_4022

Issue 4022: More detailed orphaning warning
otwcode · Jun 27, 2014 · 019bd95 · 019bd95
2 parents 017137c + 0b4b8de
commit 019bd95
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/views/orphans/_orphan_work.html.erb b/app/views/orphans/_orphan_work.html.erb
@@ -2,15 +2,24 @@
 <h2 class="heading"><%= ts('Orphan Works') %></h2>
 
 <p class="caution">
-  <%= ts("You are about to")%>
+  <%= ts("Orphaning will")%>
   <strong><%= ts("permanently")%></strong>
-  <%= ts('remove all identifying data from all of the following works, their chapters, associated series, and any feedback replies you may have left on them.') %>
+  <%= ts('detach all identifying data from the following work(s), their chapters, associated series, and any feedback replies you may have left on them.') %>
 </p>
 
+<p class="caution">
+  <%= ts("Orphaning a work removes it from your account and re-attaches it to the specially created orphan_account. Please note that this is")%>
+  <strong><%= ts("permanent and irreversible.")%></strong>
+  <%= ts("You are giving up control over the work,")%>
+  <strong><%= ts("including the ability to edit or delete it.")%></strong>
+</p> 
+
 <%= render "works/work_abbreviated_list", :works => works %>
 
 <p class="caution">
-  <%= ts("Are you sure you want to do this?") %>
+  <%= ts("Are you")%>
+  <strong><%= ts("really")%></strong>
+  <%= ts("sure you want to do this?")%>
 </p>
 <!--/descriptions-->
 

diff --git a/features/other/orphan_account.feature b/features/other/orphan_account.feature
@@ -21,7 +21,7 @@ Scenario: Orphan all works belonging to a user
   When I follow "Preferences"
   When I follow "Orphan My Works"
   Then I should see "Orphan Works"
-    And I should see "Are you sure you want to"
+    And I should see "Are you really sure you want to"
   When I choose "Take my pseud off as well"
 	And I press "Yes, I'm sure"
   Then I should see "Orphaning was successful."
@@ -52,7 +52,7 @@ Given I have an orphan account
   When I follow "Preferences"
   When I follow "Orphan My Works"
   Then I should see "Orphan Works"
-    And I should see "Are you sure you want to"
+    And I should see "Are you really sure you want to"
   When I choose "Leave a copy of my pseud on"
 	And I press "Yes, I'm sure"
   Then I should see "Orphaning was successful."