From 6d07c262f33d07b2493877035e2f3d174e3d3f00 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 15 Nov 2014 17:35:31 -0500 Subject: [PATCH] CRM-15603 - Standardize phrasing of 'This action cannot be undone.' --- templates/CRM/Admin/Page/Navigation.tpl | 2 +- templates/CRM/Contact/Form/Task/Delete.tpl | 2 +- templates/CRM/Contact/Form/Task/Unhold.tpl | 2 +- templates/CRM/Contact/Page/View/Delete.tpl | 2 +- templates/CRM/Contribute/Form/PCP/Delete.tpl | 2 +- templates/CRM/Event/Form/ManageEvent/Delete.tpl | 4 ++-- templates/CRM/Grant/Form/Grant.tpl | 2 +- templates/CRM/Group/Form/Delete.tpl | 2 +- templates/CRM/PCP/Form/PCP/Delete.tpl | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl index 3fce13160c..55a78b9af7 100644 --- a/templates/CRM/Admin/Page/Navigation.tpl +++ b/templates/CRM/Admin/Page/Navigation.tpl @@ -130,7 +130,7 @@ $("#navigation-tree").jstree('refresh'); return false; } - var deleteMsg = {/literal}"{ts escape='js'}Are you sure you want to delete this menu item:{/ts}" + " "{literal} + menuName + {/literal}" ? {ts}This action can not be undone.{/ts}"{literal}; + var deleteMsg = {/literal}"{ts escape='js'}Are you sure you want to delete this menu item:{/ts}" + " "{literal} + menuName + {/literal}" ? {ts}This action cannot be undone.{/ts}"{literal}; var isDelete = confirm( deleteMsg ); if ( isDelete ) { var postURL = {/literal}"{crmURL p='civicrm/ajax/menutree' h=0 q='key='}{crmKey name='civicrm/ajax/menutree'}"{literal}; diff --git a/templates/CRM/Contact/Form/Task/Delete.tpl b/templates/CRM/Contact/Form/Task/Delete.tpl index 196ce1e156..7a21e46c12 100644 --- a/templates/CRM/Contact/Form/Task/Delete.tpl +++ b/templates/CRM/Contact/Form/Task/Delete.tpl @@ -32,7 +32,7 @@ {elseif $trash} {ts}Are you sure you want to delete the selected contact(s)?{/ts} {ts}The contact(s) and all related data will be moved to trash and only users with the relevant permission will be able to restore it.{/ts} {else} - {ts}Are you sure you want to delete the selected contact(s)?{/ts} {ts}The contact(s) and all related data will be permanently removed.{/ts} {ts}This operation cannot be undone.{/ts} + {ts}Are you sure you want to delete the selected contact(s)?{/ts} {ts}The contact(s) and all related data will be permanently removed.{/ts} {ts}This action cannot be undone.{/ts} {/if} diff --git a/templates/CRM/Contact/Form/Task/Unhold.tpl b/templates/CRM/Contact/Form/Task/Unhold.tpl index 48fdd46034..38e10b946d 100644 --- a/templates/CRM/Contact/Form/Task/Unhold.tpl +++ b/templates/CRM/Contact/Form/Task/Unhold.tpl @@ -27,7 +27,7 @@
-

{ts}Are you sure you want to unhold email of selected contact(s)?.{/ts} {ts}This operation cannot be undone.{/ts}

+

{ts}Are you sure you want to unhold email of selected contact(s)?.{/ts} {ts}This action cannot be undone.{/ts}

{include file="CRM/Contact/Form/Task.tpl"}

{include file="CRM/common/formButtons.tpl"}
diff --git a/templates/CRM/Contact/Page/View/Delete.tpl b/templates/CRM/Contact/Page/View/Delete.tpl index 8ba1629e28..3cb5fbd51d 100644 --- a/templates/CRM/Contact/Page/View/Delete.tpl +++ b/templates/CRM/Contact/Page/View/Delete.tpl @@ -27,7 +27,7 @@

{ts 1=$displayName}Are you sure you want to delete the contact record and all related information for %1?{/ts}

-

{ts}This operation cannot be undone.{/ts}

+

{ts}This action cannot be undone.{/ts}

{include file="CRM/common/formButtons.tpl"}
diff --git a/templates/CRM/Contribute/Form/PCP/Delete.tpl b/templates/CRM/Contribute/Form/PCP/Delete.tpl index 735645d63a..d9c693bdaa 100644 --- a/templates/CRM/Contribute/Form/PCP/Delete.tpl +++ b/templates/CRM/Contribute/Form/PCP/Delete.tpl @@ -28,7 +28,7 @@
{ts 1=$title}Are you sure you want to delete Campaign Page '%1'?{/ts}
- {ts}This operation cannot be undone.{/ts} + {ts}This action cannot be undone.{/ts}
{$form.buttons.html}
diff --git a/templates/CRM/Event/Form/ManageEvent/Delete.tpl b/templates/CRM/Event/Form/ManageEvent/Delete.tpl index 77949932a9..778d445b07 100644 --- a/templates/CRM/Event/Form/ManageEvent/Delete.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Delete.tpl @@ -32,9 +32,9 @@
{if $isTemplate} - {ts}Warning: Deleting this event template will also delete associated Event Registration Page and Event Fee configurations.{/ts} {ts}This operation cannot be undone.{/ts} {ts}Do you want to continue?{/ts} + {ts}Warning: Deleting this event template will also delete associated Event Registration Page and Event Fee configurations.{/ts} {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} {else} - {ts}Warning: Deleting this event will also delete associated Event Registration Page and Event Fee configurations.{/ts} {ts}This operation cannot be undone.{/ts} {ts}Do you want to continue?{/ts} + {ts}Warning: Deleting this event will also delete associated Event Registration Page and Event Fee configurations.{/ts} {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} {/if}
diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl index 7abe7e6b93..c787fac3db 100644 --- a/templates/CRM/Grant/Form/Grant.tpl +++ b/templates/CRM/Grant/Form/Grant.tpl @@ -33,7 +33,7 @@ {if $action eq 8}

  - {ts}Are you sure you want to delete this Grant?{/ts} {ts}This operation cannot be undone.{/ts}

+ {ts}Are you sure you want to delete this Grant?{/ts} {ts}This action cannot be undone.{/ts}

{include file="CRM/Grant/Form/Task.tpl"}

{else} diff --git a/templates/CRM/Group/Form/Delete.tpl b/templates/CRM/Group/Form/Delete.tpl index ffc9a5e224..c80cb05634 100644 --- a/templates/CRM/Group/Form/Delete.tpl +++ b/templates/CRM/Group/Form/Delete.tpl @@ -33,7 +33,7 @@ {if $count} {ts count=$count plural='This group currently has %count members in it.'}This group currently has one member in it.{/ts} {/if} - {ts}Deleting this group will NOT delete the member contact records. However, all contact subscription information and history for this group will be deleted.{/ts} {ts}If this group is used in CiviCRM profiles, those fields will be reset.{/ts} {ts}This operation cannot be undone.{/ts} + {ts}Deleting this group will NOT delete the member contact records. However, all contact subscription information and history for this group will be deleted.{/ts} {ts}If this group is used in CiviCRM profiles, those fields will be reset.{/ts} {ts}This action cannot be undone.{/ts}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/PCP/Form/PCP/Delete.tpl b/templates/CRM/PCP/Form/PCP/Delete.tpl index 735645d63a..d9c693bdaa 100644 --- a/templates/CRM/PCP/Form/PCP/Delete.tpl +++ b/templates/CRM/PCP/Form/PCP/Delete.tpl @@ -28,7 +28,7 @@
{ts 1=$title}Are you sure you want to delete Campaign Page '%1'?{/ts}
- {ts}This operation cannot be undone.{/ts} + {ts}This action cannot be undone.{/ts}
{$form.buttons.html}
-- 2.25.1