From e3752210679c3eaa4fe257077ae3481b5bc0ec79 Mon Sep 17 00:00:00 2001 From: SkyEye_FAST Date: Sat, 27 Jan 2024 22:05:46 +0800 Subject: [PATCH] Fix timezone --- app.py | 10 ++++++---- requirements.txt | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index f285df4..7e84e53 100644 --- a/app.py +++ b/app.py @@ -9,7 +9,7 @@ from wtforms import StringField, SubmitField from flask_babel import Babel, lazy_gettext, format_date -from babel.dates import get_timezone_name, get_timezone +from babel.dates import get_timezone_name from base import data, is_valid_key, get_translation @@ -25,7 +25,7 @@ def get_locale(): return request.accept_languages.best_match(["zh", "en"]) -babel = Babel(flask_app, locale_selector=get_locale, timezone_selector=get_timezone) +babel = Babel(flask_app, locale_selector=get_locale) class QueryForm(FlaskForm): @@ -38,6 +38,8 @@ class QueryForm(FlaskForm): @flask_app.route("/", methods=["GET", "POST"]) def index(): """主页面""" + timezone = request.headers.get("Time-Zone") + form = QueryForm() query_str = form.source_string.data @@ -64,8 +66,8 @@ def index(): keys=keys, translation=selected_translation, date_str=date.today(), - date_str_t=format_date(date.today()), - timezone_str=get_timezone_name(get_timezone(), locale=get_locale()), + date_str_t=format_date(date.today(), "long"), + timezone_str=get_timezone_name(timezone, locale=get_locale()), ) diff --git a/requirements.txt b/requirements.txt index 65b0dd6..af46aff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +Babel==2.14.0 Flask==3.0.1 flask_babel==4.0.0 flask_wtf==1.2.1