From a0017056c1cf7b547cd5c4a1e277304bb7c6e2ae Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Wed, 26 Mar 2014 10:56:33 +0100
Subject: [PATCH] settings: make compte-agglo-montepellier override other
 locales

---
 compte_agglo_montpellier/settings.py | 31 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/compte_agglo_montpellier/settings.py b/compte_agglo_montpellier/settings.py
index ee5421b..558f039 100644
--- a/compte_agglo_montpellier/settings.py
+++ b/compte_agglo_montpellier/settings.py
@@ -44,7 +44,8 @@ def __dict_from_vars(prefix):
     return d
 
 
-PROJECT_PATH = os.path.join(os.path.dirname(__file__), '..')
+BASE_DIR = os.path.dirname(__file__)
+PROJECT_PATH = os.path.join(BASE_DIR, '..')
 PROJECT_NAME = 'compte-agglo-montpellier'
 
 ADMINS = ()
@@ -82,11 +83,6 @@ STATIC_URL = os.environ.get('STATIC_URL', '/static/')
 MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/var/lib/%s/media' % PROJECT_NAME)
 MEDIA_URL = os.environ.get('MEDIA_URL', '/media/')
 
-if 'STATICFILES_DIRS' in os.environ:
-    STATICFILES_DIRS = os.environ['STATICFILES_DIRS'].split(':')
-else:
-    STATICFILES_DIRS = ('/var/lib/%s/extra-static/' % PROJECT_NAME,)
-
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
@@ -126,11 +122,28 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'compte_agglo_montpellier.urls'
 
-TEMPLATE_DIRS = (os.path.join(PROJECT_PATH, 'compte_agglo_montpellier', 'templates'),)
+VAR_DIR = os.path.join('/var/lib/', PROJECT_NAME)
+
+LOCALE_PATHS = (
+        os.path.join(VAR_DIR, 'locale'),
+        os.path.join(BASE_DIR, 'locale'),
+)
+
+TEMPLATE_DIRS = (
+        os.path.join(VAR_DIR, 'templates'),
+        os.path.join(BASE_DIR, 'templates'),
+)
+
+STATICFILES_DIRS = (
+        os.path.join(VAR_DIR, 'extra-static'),
+        os.path.join(BASE_DIR, 'static'),
+)
+
 if os.environ.get('TEMPLATE_DIRS'):
     TEMPLATE_DIRS = tuple(os.environ['TEMPLATE_DIRS'].split(':')) + TEMPLATE_DIRS
-else:
-    TEMPLATE_DIRS += ('/var/lib/%s/templates' % PROJECT_NAME,) + TEMPLATE_DIRS
+
+if os.environ.get('STATICFILES_DIRS'):
+    STATICFILES_DIRS = tuple(os.environ['STATICFILES_DIRS'].split(':')) + STATICFILES_DIRS
 
 INSTALLED_APPS = (
     'django.contrib.auth',