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 c5d6f2b7d3249bc8ee2394a14d8731f6d975a5c9..d55abc3946164b48bd21ca0e2650fb4bfbee842c 100644 (file)
--- 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>