@@ -33,7 +33,6 @@ from django.utils.translation import gettext_lazy as _
 | 
			
		||||
from string import ascii_uppercase as auc
 | 
			
		||||
from .templatetags.utils_extra import int_to_abc
 | 
			
		||||
from django.utils.safestring import mark_safe
 | 
			
		||||
from django.utils.timezone import localtime
 | 
			
		||||
from django.utils.formats import localize
 | 
			
		||||
from .templatetags.event_extra import event_field_verbose_name, field_to_html
 | 
			
		||||
import os
 | 
			
		||||
@@ -549,17 +548,17 @@ class MergeDuplicates(Form):
 | 
			
		||||
                '<li><a href="' + e.get_absolute_url() + '">' + e.title + "</a></li>"
 | 
			
		||||
            )
 | 
			
		||||
            result += (
 | 
			
		||||
                "<li>Création : " + localize(localtime(e.created_date)) + "</li>"
 | 
			
		||||
                "<li>Création : " + localize(e.created_date) + "</li>"
 | 
			
		||||
            )
 | 
			
		||||
            result += (
 | 
			
		||||
                "<li>Dernière modification : "
 | 
			
		||||
                + localize(localtime(e.modified_date))
 | 
			
		||||
                + localize(e.modified_date)
 | 
			
		||||
                + "</li>"
 | 
			
		||||
            )
 | 
			
		||||
            if e.imported_date:
 | 
			
		||||
                result += (
 | 
			
		||||
                    "<li>Dernière importation : "
 | 
			
		||||
                    + localize(localtime(e.imported_date))
 | 
			
		||||
                    + localize(e.imported_date)
 | 
			
		||||
                    + "</li>"
 | 
			
		||||
                )
 | 
			
		||||
            result += "</ul>"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user