From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 14 Jan 2016 16:36:05 +0000 (-0500)
Subject: CRM-17818 Dedupe merge: use crmDate instead of hardcoded format
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e90cfd5898dcac42434ce89bb939a723f0a250e1;p=civicrm-core.git

CRM-17818 Dedupe merge: use crmDate instead of hardcoded format

----------------------------------------
* CRM-17818: Merge screen modified date hardcoded format
  https://issues.civicrm.org/jira/browse/CRM-17818
---

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index c5d6f2b7d3..d55abc3946 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -84,9 +84,9 @@ You will need to manually delete that user (click on the link to open the %1 use
 
   <tr>
     <td>Last modified</td>
-    <td>{$other_result.values.0.modified_date|date_format:"%d/%m/%y %H:%M:%S"} {if $other_result.values.0.modified_date gt $main_result.values.0.modified_date} (Most recent) {/if}</td>
+    <td>{$other_result.values.0.modified_date|crmDate} {if $other_result.values.0.modified_date gt $main_result.values.0.modified_date} (Most recent) {/if}</td>
     <td></td>
-    <td>{$main_result.values.0.modified_date|date_format:"%d/%m/%y %H:%M:%S"} {if $main_result.values.0.modified_date gt $other_result.values.0.modified_date} (Most recent) {/if}</td>
+    <td>{$main_result.values.0.modified_date|crmDate} {if $main_result.values.0.modified_date gt $other_result.values.0.modified_date} (Most recent) {/if}</td>
     <td></td>
   </tr>