Merge "Replace django_date with datetime.datetime.strftime"
This commit is contained in:
commit
96b54e336b
|
@ -13,7 +13,6 @@
|
||||||
import datetime
|
import datetime
|
||||||
import pprint
|
import pprint
|
||||||
|
|
||||||
from django.template.defaultfilters import date as django_date
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.views import generic
|
from django.views import generic
|
||||||
|
|
||||||
|
@ -62,9 +61,8 @@ class RestoreView(workflows.WorkflowView):
|
||||||
@shield('Unable to get backup.', redirect='backups:index')
|
@shield('Unable to get backup.', redirect='backups:index')
|
||||||
def get_workflow_name(self):
|
def get_workflow_name(self):
|
||||||
backup = freezer_api.Backup(self.request).get(self.kwargs['backup_id'])
|
backup = freezer_api.Backup(self.request).get(self.kwargs['backup_id'])
|
||||||
backup_date = datetime.datetime.fromtimestamp(int(backup.time_stamp))
|
backup_date_str = datetime.datetime.fromtimestamp(int(backup.time_stamp))\
|
||||||
backup_date_str = django_date(backup_date,
|
.strftime("%Y/%m/%d %H:%M")
|
||||||
'SHORT_DATETIME_FORMAT')
|
|
||||||
return "Restore '{}' from {}".format(backup.backup_name,
|
return "Restore '{}' from {}".format(backup.backup_name,
|
||||||
backup_date_str)
|
backup_date_str)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue