Merge branch 'feature-rosetta' into 'master'

Feature rosetta

See merge request !261

circle/circle/settings/local.py

@@ -64,6 +64,13 @@ CACHES = {
 ########## END CACHE CONFIGURATION
 ########## END CACHE CONFIGURATION
 
 
 
 
+########## ROSETTA CONFIGURATION
+INSTALLED_APPS += (
+    'rosetta',
+)
+########## END ROSETTA CONFIGURATION
+
+
 ########## TOOLBAR CONFIGURATION
 ########## TOOLBAR CONFIGURATION
 # https://github.com/django-debug-toolbar/django-debug-toolbar#installation
 # https://github.com/django-debug-toolbar/django-debug-toolbar#installation
 if get_env_variable('DJANGO_TOOLBAR', 'FALSE') == 'TRUE':
 if get_env_variable('DJANGO_TOOLBAR', 'FALSE') == 'TRUE':

circle/circle/urls.py

@@ -18,9 +18,11 @@
 from django.conf.urls import patterns, include, url
 from django.conf.urls import patterns, include, url
 from django.views.generic import TemplateView
 from django.views.generic import TemplateView
 
 
+from django.conf import settings
 from django.contrib import admin
 from django.contrib import admin
-from django.shortcuts import redirect
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse
+from django.shortcuts import redirect
+
 
 
 from circle.settings.base import get_env_variable
 from circle.settings.base import get_env_variable
 from dashboard.views import circle_login, HelpView
 from dashboard.views import circle_login, HelpView
@@ -71,6 +73,13 @@ urlpatterns = patterns(
 )
 )
 
 
 
 
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns += patterns(
+        '',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )
+
+
 if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
 if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
     urlpatterns += patterns(
     urlpatterns += patterns(
         '',
         '',

requirements/local.txt

@@ -2,4 +2,5 @@
 -r base.txt
 -r base.txt
 coverage==3.7.1
 coverage==3.7.1
 django-debug-toolbar==1.1
 django-debug-toolbar==1.1
+django-rosetta==0.7.4
 Sphinx==1.2.2
 Sphinx==1.2.2