From 31a90ae3000401698f7ec43f26e9ea8c12a59622 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Sun, 4 Sep 2016 16:05:32 +0200
Subject: [PATCH] Fix feeds and set locale for better datetime formatting

---
 feeds.py  | 6 +++---
 server.py | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/feeds.py b/feeds.py
index 7e6c4ed..d4c5976 100644
--- a/feeds.py
+++ b/feeds.py
@@ -23,13 +23,13 @@ def feed(handle=None):
 			SELECT lectures.*, videos.file_size, videos.path, videos.id AS video_id, videos.hash,
 					videos.time_created AS video_created, videos.time_updated AS video_updated,
 					courses.title AS course_title, courses.handle AS course_handle, courses.semester, courses.organizer AS course_organizer, courses.short as course_short,
-					formats.description AS format_description, formats.player_prio
+					formats.description AS format_description, formats.prio
 				FROM lectures
 				JOIN courses ON (courses.id = lectures.course_id)
 				JOIN videos ON (lectures.id = videos.lecture_id)
 				JOIN formats ON (formats.id = videos.video_format)
-				WHERE (? IS NULL) OR course_id = ? AND courses.visible AND lectures.visible AND videos.visible
-				ORDER BY time DESC, player_prio
+				WHERE ((? IS NULL AND courses.listed) OR course_id = ?) AND courses.visible AND lectures.visible AND videos.visible
+				ORDER BY video_created DESC, prio ASC
 				LIMIT 100''',
 			course['id'], course['id'])
 	updated = max(course['time_updated'], course['time_created'], key=fixdate)
diff --git a/server.py b/server.py
index cf8c297..c98b620 100755
--- a/server.py
+++ b/server.py
@@ -5,6 +5,9 @@ from datetime import date, timedelta, datetime, time, MINYEAR
 import threading
 import os
 import hashlib
+import locale
+
+locale.setlocale(locale.LC_ALL, 'de_DE')
 
 app = Flask(__name__)
 
-- 
GitLab