Skip to content

Use user timezones, fixes #8 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BasementCat wants to merge 1 commit into from
Closed

Use user timezones, fixes #8 #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/lib/jinja.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from flask import current_app
from markupsafe import Markup
import arrow
import flask_login

from app.constants import DISPLAY_SPEC, COLOR_SPEC
from app.lib.user import users_enabled
Expand Down Expand Up @@ -75,8 +76,10 @@ def plural(value, singular, plural=None):
@jfilter()
def dt(value, format='MMM Do, YYYY h:mm a', timezone=None, no_markup=False):
if value is not None:
# TODO: user tz
timezone = timezone or current_app.config['TIMEZONE']
user_tz = None
if current_app.config['ENABLE_USERS'] and flask_login.current_user.is_authenticated:
user_tz = getattr(flask_login.current_user, 'timezone', None)
timezone = timezone or user_tz or current_app.config['TIMEZONE']
value = arrow.get(value)
value_utc = value.to('UTC')
value_utc_s = value_utc.format(format)
Expand Down
Loading