Merge branch 'evarin/site-cof' into 'master'

Nouveau site du COF

See merge request klub-dev-ens/gestioCOF!247

cof/locale/en/formats.py

@@ -0,0 +1,11 @@
+# -*- encoding: utf-8 -*-
+
+"""
+English formatting.
+"""
+
+from __future__ import unicode_literals
+
+DATETIME_FORMAT = r"l N j, Y \a\t P"
+DATE_FORMAT = r"l N j, Y"
+TIME_FORMAT = r"P"

cof/locale/fr/formats.py

@@ -2,4 +2,6 @@
 Formats français.
 """
 
-DATETIME_FORMAT = r"l j F Y \à H:i"
+DATETIME_FORMAT = r"l j F Y \à H\hi"
+DATE_FORMAT = r"l j F Y"
+TIME_FORMAT = r"H\hi"

cof/settings/common.py

@@ -90,14 +90,17 @@ INSTALLED_APPS = [
     "wagtail.wagtailadmin",
     "wagtail.wagtailcore",
     "wagtail.contrib.modeladmin",
+    "wagtail.contrib.wagtailroutablepage",
     "wagtailmenus",
+    "wagtail_modeltranslation",
     "modelcluster",
     "taggit",
     "kfet.auth",
     "kfet.cms",
-    "corsheaders",
+    "gestioncof.cms",
 ]
 
+
 MIDDLEWARE = [
     "corsheaders.middleware.CorsMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -112,6 +115,7 @@ MIDDLEWARE = [
     "djconfig.middleware.DjConfigMiddleware",
     "wagtail.wagtailcore.middleware.SiteMiddleware",
     "wagtail.wagtailredirects.middleware.RedirectMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
 ]
 
 ROOT_URLCONF = "cof.urls"
@@ -164,6 +168,8 @@ USE_L10N = True
 
 USE_TZ = True
 
+LANGUAGES = (("fr", "Français"), ("en", "English"))
+
 # Various additional settings
 SITE_ID = 1
 

cof/urls.py

@@ -4,6 +4,7 @@ Fichier principal de configuration des urls du projet GestioCOF
 
 from django.conf import settings
 from django.conf.urls import include, url
+from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as django_views
@@ -131,4 +132,6 @@ if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # Wagtail for uncatched
-urlpatterns += [url(r"", include(wagtail_urls))]
+urlpatterns += i18n_patterns(
+    url(r"", include(wagtail_urls)), prefix_default_language=False
+)