pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use UTC for feed reader timestamps

Browse source
This commit is contained in:
Gina Häußge 2015-07-09 15:43:11 +02:00
parent 50ae34dc4f
commit 7a8e6b6b6d
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/plugins/announcements/__init__.py
View file

@ -8,8 +8,8 @@ __copyright__ = "Copyright (C) 2016 The OctoPrint Project - Released under terms
import octoprint.plugin
import calendar
import codecs
import datetime
import os
import re
import time
@ -44,27 +44,27 @@ class AnnouncementPlugin(octoprint.plugin.AssetPlugin,
priority=1,
type="rss",
url="http://octoprint.org/feeds/important.xml",
read_until=1449442800),
read_until=1449446400),
_releases=dict(name="OctoPrint Release Announcements",
priority=2,
type="rss",
url="http://octoprint.org/feeds/releases.xml",
read_until=1458117576),
read_until=1458121176),
_spotlight=dict(name="OctoPrint Community Spotlights",
priority=2,
type="rss",
url="http://octoprint.org/feeds/spotlight.xml",
read_until=1447950371),
read_until=1447953971),
_octopi=dict(name="OctoPi Announcements",
priority=2,
type="rss",
url="http://octoprint.org/feeds/octopi.xml",
read_until=1462197000),
read_until=1462200600),
_plugins=dict(name="New Plugins in the Repository",
priority=2,
type="rss",
url="http://plugins.octoprint.org/feed.xml",
read_until=1461625200)),
read_until=1461628800)),
enabled_channels=[],
forced_channels=["_important"],
ttl=6*60,
@ -229,7 +229,7 @@ class AnnouncementPlugin(octoprint.plugin.AssetPlugin,
return result
def _to_internal_entry(self, entry, read_until=None):
published = time.mktime(entry["published_parsed"])
published = calendar.timegm(entry["published_parsed"])
read = False
if read_until is not None:

2
src/octoprint/plugins/announcements/templates/announcements.jinja2
View file

@ -41,5 +41,5 @@
</div>
<div class="modal-footer">
<button class="btn btn-block" data-dismiss="modal" aria-hidden="true">{{ _('Close') }}</button>
</div>k
</div>
</div>