CRM-15603 - Standardize edit & view activity messages

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index b95201d1a69ffd544c8a049417d5aaadd085b838..394dc02e108c4c46bce5697df608f3fda78a2062 100644 (file)
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1182,7 +1182,7 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
     $editUrl = "{$url}&action=update{$contextUrl}";
     $deleteUrl = "{$url}&action=delete{$contextUrl}";
     $restoreUrl = "{$url}&action=renew{$contextUrl}";
-    $viewTitle = ts('View this activity.');
+    $viewTitle = ts('View activity');
     $statusTitle = ts('Edit Status');
 
     $emailActivityTypeIDs = array(

diff --git a/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_html.tpl b/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_html.tpl
index 59dce775a2d0488dbe54dd64beed3ca5cda41676..a7007f03deb6016d4bfbac9c9e197a2315534f9f 100644 (file)
--- a/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_html.tpl
+++ b/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_html.tpl
@@ -40,14 +40,14 @@
      {if $editActURL}
      <tr>
        <td colspan="2" {$valueStyle}>
-   <a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
+   <a href="{$editActURL}" title="{ts}Edit activity{/ts}">{ts}Edit activity{/ts}</a>
        </td>
      </tr>
      {/if}
      {if $viewActURL}
      <tr>
        <td colspan="2" {$valueStyle}>
-   <a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
+   <a href="{$viewActURL}" title="{ts}View activity{/ts}">{ts}View activity{/ts}</a>
        </td>
      </tr>
      {/if}

diff --git a/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_text.tpl b/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_text.tpl
index daec479e47f83ca52bd1bda4041f2a47890991f0..15317d4bb34c70714d0043f286adec2c553f858f 100644 (file)
--- a/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_text.tpl
+++ b/CRM/Upgrade/3.2.alpha3.msg_template/message_templates/case_activity_text.tpl
@@ -6,10 +6,10 @@
 {/if}
 
 {if $editActURL}
-{ts}Edit this Activity{/ts} : {$editActURL}
+{ts}Edit activity{/ts} : {$editActURL}
 {/if}
 {if $viewActURL}
-{ts}View this Activity{/ts} : {$viewActURL}
+{ts}View activity{/ts} : {$viewActURL}
 {/if}
 
 {foreach from=$activity.fields item=field}

diff --git a/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_html.tpl b/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_html.tpl
index 8749ee13af73bd04f2ac4ed7779db9e80ec6e686..04816ca83f796ef1e6c1f4fc522487066d5362bd 100644 (file)
--- a/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_html.tpl
+++ b/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_html.tpl
@@ -47,14 +47,14 @@
      {if $editActURL}
      <tr>
        <td colspan="2" {$valueStyle}>
-     <a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
+     <a href="{$editActURL}" title="{ts}Edit activity{/ts}">{ts}Edit activity{/ts}</a>
        </td>
      </tr>
      {/if}
      {if $viewActURL}
      <tr>
        <td colspan="2" {$valueStyle}>
-     <a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
+     <a href="{$viewActURL}" title="{ts}View activity{/ts}">{ts}View activity{/ts}</a>
        </td>
      </tr>
      {/if}

diff --git a/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_text.tpl b/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_text.tpl
index 70cd0d7db8dce39c8128ea43335d4ff6b901b08b..e7edad2fdf6c56ac3a0b8d03d458c77de3e5e0e2 100644 (file)
--- a/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_text.tpl
+++ b/CRM/Upgrade/3.3.2.msg_template/message_templates/case_activity_text.tpl
@@ -9,10 +9,10 @@
 {/if}
 
 {if $editActURL}
-{ts}Edit this Activity{/ts} : {$editActURL}
+{ts}Edit activity{/ts} : {$editActURL}
 {/if}
 {if $viewActURL}
-{ts}View this Activity{/ts} : {$viewActURL}
+{ts}View activity{/ts} : {$viewActURL}
 {/if}
 
 {foreach from=$activity.fields item=field}

diff --git a/templates/CRM/Case/Page/DashboardSelector.tpl b/templates/CRM/Case/Page/DashboardSelector.tpl
index dca5a445bbf025a87f91f5ba62b06797750f2599..6b3631190d92e664b285db960444dd4619b2f64c 100644 (file)
--- a/templates/CRM/Case/Page/DashboardSelector.tpl
+++ b/templates/CRM/Case/Page/DashboardSelector.tpl
@@ -63,13 +63,13 @@
     {if $list eq 'upcoming'}
        <td class="crm-case-case_scheduled_activity">
      {if $row.case_upcoming_activity_viewable}
-        <a class="crm-popup {$row.activity_status}" href="{crmURL p='civicrm/case/activity/view' h=0 q="cid="}{$row.contact_id}&aid={$row.case_scheduled_activity_id}" title="{ts}View this activity.{/ts}">{$row.case_scheduled_activity_type}</a>
+        <a class="crm-popup {$row.activity_status}" href="{crmURL p='civicrm/case/activity/view' h=0 q="cid="}{$row.contact_id}&aid={$row.case_scheduled_activity_id}" title="{ts}View activity{/ts}">{$row.case_scheduled_activity_type}</a>
      {else}
         {$row.case_scheduled_activity_type}
      {/if}
        &nbsp;&nbsp;
      {if $row.case_upcoming_activity_editable}
-       <a class="action-item crm-hover-button" href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_scheduled_activity_id`"}" title="{ts}Edit this activity.{/ts}"><span class="icon edit-icon"></span></a>
+       <a class="action-item crm-hover-button" href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_scheduled_activity_id`"}" title="{ts}Edit activity{/ts}"><span class="icon edit-icon"></span></a>
      {/if}
      <br />
      {$row.case_scheduled_activity_date|crmDate}
@@ -78,11 +78,11 @@
     {elseif $list eq 'recent'}
        <td class="crm-case-case_recent_activity">
    {if $row.case_recent_activity_viewable}
-       <a class="crm-popup" href="{crmURL p='civicrm/case/activity/view' h=0 q="cid="}{$row.contact_id}&aid={$row.case_recent_activity_id}" title="{ts}View this activity.{/ts}">{$row.case_recent_activity_type}</a>
+       <a class="crm-popup" href="{crmURL p='civicrm/case/activity/view' h=0 q="cid="}{$row.contact_id}&aid={$row.case_recent_activity_id}" title="{ts}View activity{/ts}">{$row.case_recent_activity_type}</a>
     {else}
        {$row.case_recent_activity_type}
     {/if}
-    {if $row.case_recent_activity_editable and $row.case_recent_activity_type_name != 'Inbound Email' && $row.case_recent_activity_type_name != 'Email'}&nbsp;&nbsp;<a href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_recent_activity_id`"}" title="{ts}Edit this activity.{/ts}"><span class="icon edit-icon"></span></a>
+    {if $row.case_recent_activity_editable and $row.case_recent_activity_type_name != 'Inbound Email' && $row.case_recent_activity_type_name != 'Email'}&nbsp;&nbsp;<a href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_recent_activity_id`"}" title="{ts}Edit activity{/ts}"><span class="icon edit-icon"></span></a>
     {/if}<br />
           {$row.case_recent_activity_date|crmDate}
    </td>

diff --git a/xml/templates/message_templates/case_activity_html.tpl b/xml/templates/message_templates/case_activity_html.tpl
index dd54906ce3e6582a62381b06a67f29fbbeda0a11..0dcc6c47656fa81491667656686429d19ed042c5 100644 (file)
--- a/xml/templates/message_templates/case_activity_html.tpl
+++ b/xml/templates/message_templates/case_activity_html.tpl
@@ -47,14 +47,14 @@
      {if $editActURL}
      <tr>
        <td colspan="2" {$valueStyle}>
-   <a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
+   <a href="{$editActURL}" title="{ts}Edit activity{/ts}">{ts}Edit activity{/ts}</a>
        </td>
      </tr>
      {/if}
      {if $viewActURL}
      <tr>
        <td colspan="2" {$valueStyle}>
-   <a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
+   <a href="{$viewActURL}" title="{ts}View activity{/ts}">{ts}View activity{/ts}</a>
        </td>
      </tr>
      {/if}

diff --git a/xml/templates/message_templates/case_activity_text.tpl b/xml/templates/message_templates/case_activity_text.tpl
index 3233e100527df053046ea77bb638758af9e05295..0bfa04a85ba25145a2b143e4160746caeb7b7a52 100644 (file)
--- a/xml/templates/message_templates/case_activity_text.tpl
+++ b/xml/templates/message_templates/case_activity_text.tpl
@@ -9,10 +9,10 @@
 {/if}
 
 {if $editActURL}
-{ts}Edit this Activity{/ts} : {$editActURL}
+{ts}Edit activity{/ts} : {$editActURL}
 {/if}
 {if $viewActURL}
-{ts}View this Activity{/ts} : {$viewActURL}
+{ts}View activity{/ts} : {$viewActURL}
 {/if}
 
 {foreach from=$activity.fields item=field}