Merge pull request #35 from CiCiUi/timezone-aware-log

admin panel 'created at' time is made to aware of the timezone

Author: Natgho

.github/workflows/db-logger.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['2.7', '3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9']
         django-version: ['1.9', '1.10', '1.11.17', '2.0', '2.2', '3.1', '3.2']
         exclude:
           - django-version: '2.0'

.gitignore

@@ -8,4 +8,4 @@ dist
 .coding-ide
 dev.db
 build
-
+.eggs

dev_env/settings.py

@@ -108,7 +108,7 @@
 # Internationalization
 # https://docs.djangoproject.com/en/2.1/topics/i18n/
 
-LANGUAGE_CODE = 'zh-hans'
+LANGUAGE_CODE = 'en'
 
 TIME_ZONE = 'UTC'
 

django_db_logger/admin.py

@@ -2,6 +2,7 @@
 import logging
 
 from django.contrib import admin
+from django.utils import timezone
 from django.utils.html import format_html
 
 from django_db_logger.config import DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE
@@ -10,8 +11,8 @@
 
 class StatusLogAdmin(admin.ModelAdmin):
     list_display = ('colored_msg', 'traceback', 'create_datetime_format')
-    list_display_links = ('colored_msg', )
-    list_filter = ('level', )
+    list_display_links = ('colored_msg',)
+    list_filter = ('level',)
     list_per_page = DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE
 
     def colored_msg(self, instance):
@@ -22,14 +23,16 @@ def colored_msg(self, instance):
         else:
             color = 'red'
         return format_html('<span style="color: {color};">{msg}</span>', color=color, msg=instance.msg)
+
     colored_msg.short_description = 'Message'
 
     def traceback(self, instance):
         return format_html('<pre><code>{content}</code></pre>', content=instance.trace if instance.trace else '')
 
     def create_datetime_format(self, instance):
-        return instance.create_datetime.strftime('%Y-%m-%d %X')
+        return timezone.localtime(instance.create_datetime).strftime('%Y-%m-%d %X')
+
     create_datetime_format.short_description = 'Created at'
 
 
-admin.site.register(StatusLog, StatusLogAdmin)
+admin.site.register(StatusLog, StatusLogAdmin)

setup.py

@@ -14,7 +14,7 @@ def local_scheme(version):
 
 setup(
     name='django-db-logger',
-    version='0.1.12',
+    version='0.1.13',
     use_scm_version={"local_scheme": local_scheme} if os.getenv('TestPypi') == 'yes' else False,  # using `setuptools_scm` when publish to test.pypi
     setup_requires=['setuptools_scm'],
     packages=['django_db_logger', 'django_db_logger.migrations'],
@@ -33,9 +33,6 @@ def local_scheme(version):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',