Merge branch 'issue2059' into develop

2 files changed, 7 insertions, 6 deletions

diff --git a/glances/compat.py b/glances/compat.py
index 1dc1eacd..73b52256 100644
--- a/glances/compat.py
+++ b/glances/compat.py
@@ -327,17 +327,17 @@ def pretty_date(time=False):
         if second_diff < 10:
             return "just now"
         if second_diff < 60:
-            return str(second_diff) + " seconds"
+            return str(second_diff) + " secs"
         if second_diff < 120:
-            return "a minute"
+            return "a min"
         if second_diff < 3600:
-            return str(second_diff // 60) + " minutes"
+            return str(second_diff // 60) + " mins"
         if second_diff < 7200:
             return "an hour"
         if second_diff < 86400:
             return str(second_diff // 3600) + " hours"
     if day_diff == 1:
-        return "Yesterday"
+        return "yesterday"
     if day_diff < 7:
         return str(day_diff) + " days"
     if day_diff < 31:
diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py
index d392b117..99ada6bf 100644
--- a/glances/plugins/glances_docker.py
+++ b/glances/plugins/glances_docker.py
@@ -24,7 +24,7 @@ from glances.timer import getTimeSinceLastUpdate
 # https://github.com/docker/docker-py
 try:
     import docker
-    from dateutil import parser
+    from dateutil import parser, tz
 except Exception as e:
     import_error_tag = True
     # Display debug message if import KeyError
@@ -279,7 +279,8 @@ class Plugin(GlancesPlugin):
                     container_stats['network_tx'] = container_stats['network'].get('tx', None)
                     # Uptime
                     container_stats['Uptime'] = pretty_date(
-                        parser.parse(container.attrs['State']['StartedAt']).replace(tzinfo=None)
+                        # parser.parse(container.attrs['State']['StartedAt']).replace(tzinfo=None)
+                        parser.parse(container.attrs['State']['StartedAt']).astimezone(tz.tzlocal()).replace(tzinfo=None)
                     )
                 else:
                     container_stats['cpu'] = {}