From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Oct 2022 17:43:04 +0000 (+0000)
Subject: users: Drop any timezone stuff
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6468877efba57284881681347660ba11d490e213;p=pbs.git

users: Drop any timezone stuff

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 65d49fde..62f781fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,8 +285,7 @@ dist_templates_modules_jobs_DATA = \
 templates_modules_jobsdir = $(templates_modulesdir)/jobs
 
 dist_templates_modules_select_DATA = \
-	src/templates/modules/select/locale.html \
-	src/templates/modules/select/timezone.html
+	src/templates/modules/select/locale.html
 
 templates_modules_selectdir = $(templates_modulesdir)/select
 
diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 56f31b46..12bb44fd 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -5,7 +5,6 @@ import email.utils
 import ldap
 import logging
 import pickle
-import pytz
 import time
 
 import tornado.locale
@@ -377,20 +376,6 @@ class User(base.DataObject):
 	def locale(self):
 		return tornado.locale.get()
 
-	# Timezone
-
-	@property
-	def timezone(self, tz=None):
-		if tz is None:
-			tz = self.data.timezone or ""
-
-		try:
-			tz = pytz.timezone(tz)
-		except pytz.UnknownTimeZoneError:
-			tz = pytz.timezone("UTC")
-
-		return tz
-
 	@property
 	def deleted(self):
 		return self.data.deleted
diff --git a/src/templates/modules/select/timezone.html b/src/templates/modules/select/timezone.html
deleted file mode 100644
index a7a8a7b9..00000000
--- a/src/templates/modules/select/timezone.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<select class="form-control" name="{{ name }}" {% if id %}id="{{ id }}" aria-describedby="{{ id }}Help"{% end %}>
-	<option value="">- {{ _("Auto-select") }} -</option>
-
-	{% for tz in supported_timezones %}
-		<option value="{{ tz }}" {% if preselect and preselect == tz %}selected="selected"{% end %}>
-			{{ tz }}
-		</option>
-	{% end %}
-</select>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 9e44840e..4f239520 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -83,7 +83,6 @@ class Application(tornado.web.Application):
 				"HeadingDate"        : ui_modules.HeadingDateModule,
 
 				"SelectLocale"       : ui_modules.SelectLocaleModule,
-				"SelectTimezone"     : ui_modules.SelectTimezoneModule,
 			},
 			ui_methods = {
 				"extract_hostname"   : self.extract_hostname,
diff --git a/src/web/base.py b/src/web/base.py
index 9dd0205b..1822f489 100644
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 import http.client
-import pytz
 import time
 import tornado.locale
 import tornado.web
@@ -55,20 +54,9 @@ class BaseHandler(tornado.web.RequestHandler):
 		"""
 		return self.request.headers.get("User-Agent", None)
 
-	@property
-	def timezone(self):
-		if self.current_user:
-			return self.current_user.timezone
-
-		return pytz.utc
-
-	def format_date(self, date, relative=True, shorter=False,
-			full_format=False):
-		# XXX not very precise but working for now.
-		gmt_offset = self.timezone.utcoffset(date).total_seconds() / -60
-
-		return self.locale.format_date(date, gmt_offset=gmt_offset,
-			relative=relative, shorter=shorter, full_format=full_format)
+	def format_date(self, date, relative=True, shorter=False, full_format=False):
+		return self.locale.format_date(date, relative=relative,
+			shorter=shorter, full_format=full_format)
 
 	def get_template_namespace(self):
 		ns = tornado.web.RequestHandler.get_template_namespace(self)
diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index 56def25b..2cd352f5 100644
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -5,7 +5,6 @@ import math
 import pygments
 import pygments.formatters
 import pygments.lexers
-import pytz
 import re
 import tornado.web
 
@@ -310,10 +309,3 @@ class SelectLocaleModule(UIModule):
 	def render(self, name=None, id=None, preselect=None):
 		return self.render_string("modules/select/locale.html",
 			name=name, id=id, preselect=preselect, supported_locales=self.LOCALE_NAMES)
-
-
-class SelectTimezoneModule(UIModule):
-	def render(self, name=None, id=None, preselect=None):
-		return self.render_string("modules/select/timezone.html",
-			name=name, id=id, preselect=preselect,
-			supported_timezones=pytz.common_timezones)