Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-10 21:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Present dates for updater in local date format

Browse Source
This commit is contained in:
OzzieIsaacs 2017-12-02 18:42:21 +01:00
parent 319077aea9
commit 4c05b3db67
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cps/web.py
View File

@ -56,7 +56,7 @@ from werkzeug.datastructures import Headers
from babel import Locale as LC from babel import Locale as LC
from babel import negotiate_locale from babel import negotiate_locale
from babel import __version__ as babelVersion from babel import __version__ as babelVersion
from babel.dates import format_date from babel.dates import format_date, format_datetime
from functools import wraps from functools import wraps
import base64 import base64
from sqlalchemy.sql import * from sqlalchemy.sql import *
@ -429,7 +429,7 @@ def mimetype_filter(val):
@app.template_filter('formatdate') @app.template_filter('formatdate')
def formatdate(val): def formatdate_filter(val):
conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val) conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S") formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
return format_date(formatdate, format='medium', locale=get_locale()) return format_date(formatdate, format='medium', locale=get_locale())
@ -996,7 +996,8 @@ def get_update_status():
status['status'] = True status['status'] = True
commitdate = requests.get('https://api.github.com/repos/janeczku/calibre-web/git/commits/'+commit['object']['sha']).json() commitdate = requests.get('https://api.github.com/repos/janeczku/calibre-web/git/commits/'+commit['object']['sha']).json()
if "committer" in commitdate: if "committer" in commitdate:
status['commit'] = commitdate['committer']['date'] form_date=datetime.datetime.strptime(commitdate['committer']['date'],"%Y-%m-%dT%H:%M:%SZ")
status['commit'] = format_datetime(form_date, format='short', locale=get_locale())
else: else:
status['commit'] = u'Unknown' status['commit'] = u'Unknown'
else: else:
@ -2430,6 +2431,17 @@ def profile():
@admin_required @admin_required
def admin(): def admin():
commit = '$Format:%cI$' commit = '$Format:%cI$'
if commit.startswith("$"):
commit = _(u'Unknown')
else:
form_date = datetime.datetime.strptime(commit[:19], "%Y-%m-%dT%H:%M:%S")
if len(commit) > 19: # check if string has timezone
if commit[19] == '+':
form_date -= datetime.timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
elif commit[19] == '-':
form_date += datetime.timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
commit = format_datetime(form_date, format='short', locale=get_locale())
content = ub.session.query(ub.User).all() content = ub.session.query(ub.User).all()
settings = ub.session.query(ub.Settings).first() settings = ub.session.query(ub.Settings).first()
return render_title_template("admin.html", content=content, email=settings, config=config, commit=commit, return render_title_template("admin.html", content=content, email=settings, config=config, commit=commit,