From 84b50598e4dadf6716b554daf8469b1eb46ef0de Mon Sep 17 00:00:00 2001
From: fergalmoran <fergal.moran@gmail.com>
Date: Wed, 13 Mar 2013 14:03:05 +0000
Subject: [PATCH] Changed locale settings server side

---
 dss/settings.py         | 3 +--
 spa/admin.py            | 2 ++
 spa/models/MixPlay.py   | 2 +-
 spa/models/_Activity.py | 3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dss/settings.py b/dss/settings.py
index caeee35..6b52a7d 100644
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -136,7 +136,6 @@ MIDDLEWARE_CLASSES = (
 WSGI_APPLICATION = 'dss.wsgi.application'
 TEMPLATE_DIRS = (here('templates'),)
 INSTALLED_APPS = (
-    'grappelli',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -204,7 +203,7 @@ SOCIALACCOUNT_PROVIDERS = {
     'facebook': {
         'SCOPE': ['email', 'publish_stream', 'publish_actions'],
         'METHOD': 'oauth2',
-        'LOCALE_FUNC': 'path.to.callable'
+        'LOCALE_FUNC': lambda request: 'en_IE'
     }
 }
 ACCOUNT_EMAIL_REQUIRED = True
diff --git a/spa/admin.py b/spa/admin.py
index c39c31f..7847855 100644
--- a/spa/admin.py
+++ b/spa/admin.py
@@ -7,6 +7,7 @@ from spa.models.Release import Release
 from spa.models.Event import Event
 from spa.models.Label import Label
 from spa.models.Mix import Mix
+from spa.models._Activity import _Activity
 from spa.models.MixLike import MixLike
 from spa.models.MixPlay import MixPlay
 from spa.models.MixFavourite import MixFavourite
@@ -21,6 +22,7 @@ class DefaultAdmin(admin.ModelAdmin):
 
 
 admin.site.register(Mix)
+admin.site.register(_Activity)
 admin.site.register(MixLike)
 admin.site.register(MixPlay)
 admin.site.register(MixFavourite)
diff --git a/spa/models/MixPlay.py b/spa/models/MixPlay.py
index 6bb7246..94042b2 100644
--- a/spa/models/MixPlay.py
+++ b/spa/models/MixPlay.py
@@ -9,7 +9,7 @@ class MixPlay(_Activity):
         if self.user is None:
             return "%s %s %s %s" % ("Anonymous", self.get_verb_passed(), self.get_object_name(), self.date)
         else:
-            return "%s %s %s %s" % (self.user.get_full_name, self.get_verb_passed(), self.get_object_name(), self.date)
+            return "%s %s %s %s" % (self.user.get_full_name(), self.get_verb_passed(), self.get_object_name(), self.date)
 
     def get_verb_passed(self):
         return "played"
diff --git a/spa/models/_Activity.py b/spa/models/_Activity.py
index 4c6d717..8edcbf1 100644
--- a/spa/models/_Activity.py
+++ b/spa/models/_Activity.py
@@ -20,6 +20,9 @@ class _Activity(_BaseModel):
     class Meta:
         app_label = 'spa'
 
+    def __unicode__(self):
+        return "%s" % (self.date)
+
     @abc.abstractmethod
     def get_verb_passed(self):
         return