Bläddra i källkod

[FIX] system timezone

Gogs 7 år sedan
förälder
incheckning
b943fb1ad6
1 ändrade filer med 9 tillägg och 2 borttagningar
  1. 9 2
      controllers/main.py

+ 9 - 2
controllers/main.py

@@ -6,6 +6,7 @@ from werkzeug.datastructures import Headers
 from datetime import datetime
 from datetime import datetime
 from dateutil.relativedelta import relativedelta as rd
 from dateutil.relativedelta import relativedelta as rd
 from dateutil.parser import parse
 from dateutil.parser import parse
+from pytz import timezone
 from gzip import GzipFile
 from gzip import GzipFile
 from StringIO import StringIO as IO
 from StringIO import StringIO as IO
 import simplejson as json
 import simplejson as json
@@ -18,12 +19,18 @@ DATETIME_FORMAT = '%Y-%m-%d %H:%m:%S'
 GZIP_COMPRESSION_LEVEL = 9
 GZIP_COMPRESSION_LEVEL = 9
 
 
 class Purchases(http.Controller):
 class Purchases(http.Controller):
+    
+    '''
+        Get timezone
+    '''
+    def get_timezone(self):
+        return timezone(request.context['tz'])
 
 
     '''
     '''
         Get server date to send
         Get server date to send
     '''
     '''
     def get_server_date(self):
     def get_server_date(self):
-        return datetime.utcnow().strftime(DATE_FORMAT)
+        return datetime.now(self.get_timezone()).strftime(DATE_FORMAT)
 
 
     '''
     '''
         Get current user information
         Get current user information
@@ -657,7 +664,7 @@ class Purchases(http.Controller):
         self.make_info_log('Processing {}'.format(mode))
         self.make_info_log('Processing {}'.format(mode))
 
 
         # Get date
         # Get date
-        date_now = datetime.utcnow().strftime(DATE_FORMAT)
+        date_now = datetime.now(self.get_timezone()).strftime(DATE_FORMAT)
         self.make_info_log('Getting date')
         self.make_info_log('Getting date')
 
 
         # Get currency
         # Get currency