From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 6 May 2014 22:42:07 +0000 (+0200)
Subject: cleanup conf
X-Git-Tag: 0.5.5~1^2~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ee3f6d1433eb532e17d0b861e92828a211c2e66d;p=timeside.git

cleanup conf
---

diff --git a/timeside/server/sandbox/settings.py b/timeside/server/sandbox/settings.py
index 2318f5f..1cd5c10 100644
--- a/timeside/server/sandbox/settings.py
+++ b/timeside/server/sandbox/settings.py
@@ -31,11 +31,11 @@ ALLOWED_HOSTS = []
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'America/Chicago'
+TIME_ZONE = 'Europe/Paris'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'fr-fr'
 
 SITE_ID = 1
 
@@ -131,7 +131,6 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
     'django_extensions',
     'south',
-    # 'timeside',
     'timeside.server',
     'timeside.player',
     'rest_framework',
diff --git a/timeside/server/views.py b/timeside/server/views.py
index 141b76f..f371e19 100644
--- a/timeside/server/views.py
+++ b/timeside/server/views.py
@@ -99,4 +99,6 @@ class ResultGrapherView(View):
 
     def get(self, request, *args, **kwargs):
         result = Result.objects.get(pk=kwargs['pk'])
-        return HttpResponse(stream_from_file(result.file.path), mimetype='image/png')
+        return HttpResponse(stream_from_file(result.file.path), 
+                            mimetype='image/png')
+