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