Merge pull request #38 from SPARLab/dev-upgrade

Author: dgboss

VicBikeMap/settings/base.py

@@ -14,14 +14,14 @@
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.gzip.GZipMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     # 'middlewares.ForceDefaultLanguageMiddleware',
-    'solid_i18n.middleware.SolidLocaleMiddleware',
-    # 'django.middleware.locale.LocaleMiddleware',
+    # 'solid_i18n.middleware.SolidLocaleMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -63,6 +63,8 @@
 
 USE_TZ = False
 
+prefix_default_language=False
+
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),
 )
@@ -75,7 +77,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-
+    'reset_migrations',
     # forum
     'spirit',
 
@@ -108,7 +110,6 @@
     'django.contrib.sites',
     'allauth',
     'allauth.account',
-    'allauth.socialaccount',
 
     # userApp requirements
     'userApp',

VicBikeMap/urls.py

@@ -1,13 +1,12 @@
+import certbot_django.server.urls
+from django.conf import settings
 from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
-from django.conf import settings
+from django.contrib import admin
+from django.views import static
 from django.views.generic.base import TemplateView
 from django.views.i18n import JavaScriptCatalog
-from django.contrib import admin
-from solid_i18n.urls import solid_i18n_patterns
 from rest_framework.authtoken import views as auth_views
-from django.views import static
-import certbot_django.server.urls
 
 admin.autodiscover()
 js_info_dict = {
@@ -16,26 +15,26 @@
 }
 
 
-
 urlpatterns = [
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^api-token-auth/', auth_views.obtain_auth_token),
     url(r'^rest-auth/', include('rest_auth.urls')),
     url(r'^rest-auth/registration/', include('rest_auth.registration.urls')),
     url(r'^accounts/', include('allauth.urls')),
     url(r'^accounts/', include('django.contrib.auth.urls')),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url(r'^robots.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')),
     url(r'^jsi18n/$', JavaScriptCatalog.as_view(), name='javascript-catalog'),
     url(r'^\.well-known/', include(certbot_django.server.urls)),
 ]
 
-# Add internationalization url patters to these pages
-urlpatterns += solid_i18n_patterns(
-    url(r'^', include('mapApp.urls', namespace="mapApp")),
-    url(r'^user/', include('userApp.urls', namespace="userApp")),
-    url(r'^blog/', include('blogApp.urls', namespace="blogApp")),
+# # Add internationalization url patters to these pages
+urlpatterns += i18n_patterns(
+    url(r'^', include(('mapApp.urls', '/'), namespace="mapApp")),
+    url(r'^user/', include(('userApp.urls', 'user'), namespace="userApp")),
+    url(r'^blog/', include(('blogApp.urls', 'blog'), namespace="blogApp")),
     url(r'^jsi18n/$', JavaScriptCatalog.as_view(), name='javascript-catalog'),
+    prefix_default_language=False
 )
 
 if settings.DEBUG:

blogApp/forms/post.py

@@ -1,5 +1,5 @@
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext_lazy as trans
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as trans
 from django import forms
 
 from crispy_forms.helper import FormHelper

blogApp/forms/upload_image.py

@@ -1,5 +1,5 @@
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext as trans
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as trans
 from django import forms
 
 from crispy_forms.helper import FormHelper

blogApp/migrations/0001_initial.py

@@ -1,30 +1,29 @@
-# -*- coding: utf-8 -*-
+# Generated by Django 2.2 on 2021-02-12 20:58
 
-
-from django.db import models, migrations
 import datetime
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
     operations = [
         migrations.CreateModel(
             name='Post',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('date', models.DateTimeField(auto_now_add=True, verbose_name=b'Date created')),
-                ('title', models.CharField(max_length=100, verbose_name=b'Title')),
-                ('description', models.CharField(max_length=300, verbose_name=b'Description')),
-                ('post_date', models.DateTimeField(default=datetime.datetime.now, verbose_name=b'Date posted')),
-                ('slug', models.SlugField(unique=True, max_length=100, verbose_name=b'Slug', blank=True)),
-                ('published', models.BooleanField(default=False, verbose_name=b'Published')),
-                ('content', models.TextField(verbose_name=b'Content', blank=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
+                ('title', models.CharField(max_length=100, verbose_name='Title')),
+                ('description', models.CharField(max_length=300, verbose_name='Description')),
+                ('post_date', models.DateTimeField(default=datetime.datetime.now, verbose_name='Date posted')),
+                ('slug', models.SlugField(blank=True, max_length=100, unique=True, unique_for_date='created', verbose_name='Slug')),
+                ('published', models.BooleanField(default=False, verbose_name='Published')),
+                ('content', models.TextField(blank=True, verbose_name='Content')),
+                ('language', models.CharField(choices=[('en', 'English'), ('fr', 'French')], default='en', max_length=50, verbose_name='Language')),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
     ]

blogApp/migrations/0002_post_language.py

@@ -1,6 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.template.defaultfilters import slugify
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from django.db import models
 from blogApp.utils import hash62
@@ -23,7 +23,8 @@ class Post(models.Model):
     title = models.CharField(_('Title'), max_length=100)
     description = models.CharField(_('Description'), max_length=300)
     post_date = models.DateTimeField(_('Date posted'), default=datetime.now)
-    slug = models.SlugField(_('Slug'), unique=True, blank=True, max_length=100)
+    slug = models.SlugField(
+        _('Slug'), unique=True, blank=True, max_length=100, unique_for_date='created')
     published = models.BooleanField(_('Published'), default=False)
     content = models.TextField(_('Content'), blank=True)
     language = models.CharField(

blogApp/models/post.py

@@ -1,7 +1,7 @@
 {% extends "mapApp/base.html" %}
 {% block title %}BikeMaps Blog{% endblock %}
 
-{% load staticfiles markdown_deux_tags %}
+{% load static markdown_deux_tags %}
 {% load i18n %}
 
 

blogApp/templates/blogApp/base_blog.html

@@ -1,5 +1,5 @@
 {% extends "mapApp/base.html" %}
-{% load staticfiles crispy_forms_tags markdown_deux_tags i18n %}
+{% load static crispy_forms_tags markdown_deux_tags i18n %}
 
 {% block title %}{% trans "Create a new post" %}{% endblock %}
 

blogApp/templates/blogApp/create_post.html

@@ -1,5 +1,5 @@
 {% extends "blogApp/base_blog.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{{ post.title }}{% endblock %}