Fix RSS feeds for django 1.4 - reintegrate them in the main application

3 files changed, 3 insertions, 11 deletions

diff --git a/extra-locales/chimere_rss b/extra-locales/chimere_rss
deleted file mode 120000
index 1a8285a..0000000
--- a/extra-locales/chimere_rss
+++ /dev/null
@@ -1 +0,0 @@
-../../chimere_rss/
\ No newline at end of file
diff --git a/settings.py b/settings.py
index ddd8261..82c4454 100644
--- a/settings.py
+++ b/settings.py
@@ -54,6 +54,8 @@ CHIMERE_DISPLAY_AREAS = True
 # don't forget to run the upgrade.py script to create appropriate fields in
 # the database
 CHIMERE_DAYS_BEFORE_EVENT = 30
+# allow feeds
+CHIMERE_FEEDS = True
 
 CHIMERE_ICON_WIDTH = 21
 CHIMERE_ICON_HEIGHT = 25
@@ -180,15 +182,10 @@ INSTALLED_APPS = (
     'djcelery',
     'south',
     'chimere',
-    # activate it if you want to use migration scripts
+    # activate it if you want to use old migration scripts
     #'chimere.scripts',
-    # activate it if you want to use RSS feeds
-    #'chimere_rss'
 )
 
-if 'chimere_rss' in INSTALLED_APPS:
-    TEMPLATE_DIRS.append(ROOT_PATH + 'chimere_rss/templates')
-
 LOGGING = {'version': 1,
      'disable_existing_loggers': False,
     'handlers': {
diff --git a/urls.py b/urls.py
index 6dc5e32..a49cb4f 100644
--- a/urls.py
+++ b/urls.py
@@ -30,10 +30,6 @@ urlpatterns = patterns('django.views.static',
 )
 urlpatterns += staticfiles_urlpatterns()
 
-if 'chimere_rss' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
-    url(r'^feeds/', include('chimere_rss.urls', namespace="chimere-rss")),)
-
 urlpatterns += patterns('',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),