Merge pull request #50 from merwok-forks/add-french-translation

French translation

.gitignore

@@ -44,7 +44,6 @@ coverage.xml
 *,cover
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:

.travis.yml

@@ -1,38 +1,60 @@
 language: python
 python: 3.5
 env:
-  - TOX_ENV=py27-17
-  - TOX_ENV=py27-18
-  - TOX_ENV=py27-19
-  - TOX_ENV=py27-110
-  - TOX_ENV=py27-111
-  - TOX_ENV=py34-17
-  - TOX_ENV=py34-18
-  - TOX_ENV=py34-19
-  - TOX_ENV=py34-110
-  - TOX_ENV=py34-111
-  - TOX_ENV=py34-20
-  - TOX_ENV=py34-21
-  - TOX_ENV=py35-18
-  - TOX_ENV=py35-19
-  - TOX_ENV=py35-110
-  - TOX_ENV=py35-111
-  - TOX_ENV=py35-20
-  - TOX_ENV=py35-21
-  - TOX_ENV=py35-master
+  - TOX_ENV=py27-dj17
+  - TOX_ENV=py27-dj18
+  - TOX_ENV=py27-dj19
+  - TOX_ENV=py27-dj110
+  - TOX_ENV=py27-dj111
+  - TOX_ENV=py34-dj17
+  - TOX_ENV=py34-dj18
+  - TOX_ENV=py34-dj19
+  - TOX_ENV=py34-dj110
+  - TOX_ENV=py34-dj111
+  - TOX_ENV=py34-dj20
+  - TOX_ENV=py35-dj18
+  - TOX_ENV=py35-dj19
+  - TOX_ENV=py35-dj110
+  - TOX_ENV=py35-dj111
+  - TOX_ENV=py35-dj20
+  - TOX_ENV=py35-dj21
+  - TOX_ENV=py35-djmaster
+  # - TOX_ENV=py36-dj111
+  # - TOX_ENV=py36-dj20
+  # - TOX_ENV=py36-dj21
+  # - TOX_ENV=py36-djmaster
+  # - TOX_ENV=py37-dj20
+  # - TOX_ENV=py37-dj21
+  # - TOX_ENV=py37-djmaster
 matrix:
   include:
     - python: "3.6"
-      env: TOX_ENV=py36-111
+      env: TOX_ENV=py36-dj111
     - python: "3.6"
-      env: TOX_ENV=py36-20
+      env: TOX_ENV=py36-dj20
     - python: "3.6"
-      env: TOX_ENV=py36-21
+      env: TOX_ENV=py36-dj21
     - python: "3.6"
-      env: TOX_ENV=py36-master
+      env: TOX_ENV=py36-djmaster
+    - python: "3.7"
+      env: TOX_ENV=py37-dj20
+      dist: xenial
+      language: python
+      sudo: required
+    - python: "3.7"
+      env: TOX_ENV=py37-dj21
+      dist: xenial
+      language: python
+      sudo: required
+    - python: "3.7"
+      env: TOX_ENV=py37-djmaster
+      dist: xenial
+      language: python
+      sudo: required
   allow_failures:
-    - env: TOX_ENV=py35-master
-    - env: TOX_ENV=py36-master
+    - env: TOX_ENV=py35-djmaster
+    - env: TOX_ENV=py36-djmaster
+    - env: TOX_ENV=py37-djmaster
 install:
   - pip install tox
 script:

README.md

@@ -24,8 +24,8 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
   - `sorl-thumbnail`
 
 ## Requirements
-- Python 2.7, 3.4, 3.5, 3.6
-- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
+- Python 2.7, 3.4, 3.5, 3.6, 3.7
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
 
 ## Installation
 - Run `pip install django-admin-interface`

README.rst

@@ -27,8 +27,8 @@ Features
 Requirements
 ------------
 
-- Python 2.7, 3.4, 3.5, 3.6
-- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
+- Python 2.7, 3.4, 3.5, 3.6, 3.7
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
 
 Installation
 ------------

admin_interface/admin.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin
+from django.utils.translation import ugettext_lazy as _
 
 from admin_interface.models import Theme
 
@@ -15,14 +16,14 @@ class ThemeAdmin(admin.ModelAdmin):
             'classes': ('wide', ),
             'fields': ('name', 'active', )
         }),
-        ('Enviroment', {
+        (_('Environment'), {
             'classes': ('wide', ),
             'fields': (
                 'env',
                 'env_visible',
             )
         }),
-        ('Logo', {
+        (_('Logo'), {
             'classes': ('wide', ),
             'fields': (
                 'logo',
@@ -30,11 +31,11 @@ class ThemeAdmin(admin.ModelAdmin):
                 'logo_visible',
             )
         }),
-        ('Favicon', {
+        (_('Favicon'), {
             'classes': ('wide', ),
             'fields': ('favicon', )
         }),
-        ('Title', {
+        (_('Title'), {
             'classes': ('wide', ),
             'fields': (
                 'title',
@@ -42,7 +43,7 @@ class ThemeAdmin(admin.ModelAdmin):
                 'title_visible',
             )
         }),
-        ('Header', {
+        (_('Header'), {
             'classes': ('wide', ),
             'fields': (
                 'css_header_background_color',
@@ -51,7 +52,7 @@ class ThemeAdmin(admin.ModelAdmin):
                 'css_header_link_hover_color',
             )
         }),
-        ('Breadcrumbs / Module headers', {
+        (_('Breadcrumbs / Module headers'), {
             'classes': ('wide', ),
             'fields': (
                 'css_module_background_color',
@@ -61,14 +62,14 @@ class ThemeAdmin(admin.ModelAdmin):
                 'css_module_rounded_corners',
             )
         }),
-        ('Generic Links', {
+        (_('Generic Links'), {
             'classes': ('wide', ),
             'fields': (
                 'css_generic_link_color',
                 'css_generic_link_hover_color',
             )
         }),
-        ('Save Buttons', {
+        (_('Save Buttons'), {
             'classes': ('wide', ),
             'fields': (
                 'css_save_button_background_color',
@@ -76,7 +77,7 @@ class ThemeAdmin(admin.ModelAdmin):
                 'css_save_button_text_color',
             )
         }),
-        ('Delete Buttons', {
+        (_('Delete Buttons'), {
             'classes': ('wide', ),
             'fields': (
                 'css_delete_button_background_color',
@@ -84,7 +85,7 @@ class ThemeAdmin(admin.ModelAdmin):
                 'css_delete_button_text_color',
             )
         }),
-        ('Related Modal', {
+        (_('Related Modal'), {
             'classes': ('wide', ),
             'fields': (
                 'related_modal_active',
@@ -93,11 +94,11 @@ class ThemeAdmin(admin.ModelAdmin):
                 'related_modal_rounded_corners',
             )
         }),
-        ('List Filter', {
+        (_('List Filter'), {
             'classes': ('wide', ),
             'fields': ('list_filter_dropdown', )
         }),
-        ('Recent Actions', {
+        (_('Recent Actions'), {
             'classes': ('wide', ),
             'fields': ('recent_actions_visible', )
         }),
@@ -105,4 +106,5 @@ class ThemeAdmin(admin.ModelAdmin):
 
     save_on_top = True
 
+
 admin.site.register(Theme, ThemeAdmin)

admin_interface/apps.py

@@ -2,16 +2,19 @@
 
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
+from django.utils.translation import ugettext_lazy as _
 
 
 class AdminInterfaceConfig(AppConfig):
 
     name = 'admin_interface'
-    verbose_name = 'Admin Interface'
+    verbose_name = _('Admin Interface')
 
     def ready(self):
 
+        from admin_interface import settings
         from admin_interface.models import Theme
 
+        settings.check_installed_apps()
         post_migrate.connect(
             Theme.post_migrate_handler, sender=self)

admin_interface/locale/es/LC_MESSAGES/django.po

@@ -0,0 +1,187 @@
+# This file is distributed under the same license as the
+# django-admin-interface package.
+#
+# Translators:
+# Martin Vuelta <martin.vuelta@softbutterfly.io>, 2018
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: django-admin-interface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-01-07 11:23-0500\n"
+"PO-Revision-Date: 2018-12-30 19:13-0500\n"
+"Last-Translator: Martin Vuelta <martin.vuelta@softbutterfly.io>\n"
+"Language-Team: Spanish <dev@softbutterfly.io>\n"
+"Language: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:19
+msgid "Environment"
+msgstr "Ambiente"
+
+#: admin.py:26
+msgid "Logo"
+msgstr "Logo"
+
+#: admin.py:34
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin.py:38
+msgid "Title"
+msgstr "Título"
+
+#: admin.py:46
+msgid "Header"
+msgstr "Encabezado"
+
+#: admin.py:55
+msgid "Breadcrumbs / Module headers"
+msgstr "Breadcrumbs / Encabezados de módulos"
+
+#: admin.py:65
+msgid "Generic Links"
+msgstr "Enlaces genéricos"
+
+#: admin.py:72
+msgid "Save Buttons"
+msgstr "Botones de guardar"
+
+#: admin.py:80
+msgid "Delete Buttons"
+msgstr "Botones de borrar"
+
+#: admin.py:88
+msgid "Related Modal"
+msgstr "Modal para objetos relacionados"
+
+#: admin.py:97
+msgid "List Filter"
+msgstr "Lista de filtros"
+
+#: admin.py:101
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: apps.py:11
+msgid "Admin Interface"
+msgstr "Interfaz de administración"
+
+#: models.py:54
+msgid "name"
+msgstr "Nombre"
+
+#: models.py:57 models.py:220
+msgid "active"
+msgstr "Activo"
+
+#: models.py:61 templates/admin/base_site.html:6
+#: templates/admin/base_site.html:66
+msgid "Django administration"
+msgstr "Administración de Django"
+
+#: models.py:63
+msgid "title"
+msgstr "Título"
+
+#: models.py:69
+msgid "title color"
+msgstr "Color de título"
+
+#: models.py:72 models.py:87 models.py:108 models.py:253
+msgid "visible"
+msgstr "Visible"
+
+#: models.py:77
+msgid "Leave blank to use the default Django logo"
+msgstr "Dejar en blanco para usaer el logo por defecto de Django"
+
+#: models.py:78
+msgid "logo"
+msgstr "logo"
+
+#: models.py:84
+msgid "logo color"
+msgstr "color de logo"
+
+#: models.py:92
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "Formatos ico, png o gif. Tamaños de 16x16 o 32x32 pixeles"
+
+#: models.py:93
+msgid "favicon"
+msgstr "favicon"
+
+#: models.py:96
+msgid "Development"
+msgstr "Desarrollo"
+
+#: models.py:97
+msgid "Testing"
+msgstr "Pruebas"
+
+#: models.py:98
+msgid "Staging"
+msgstr "Depliegue"
+
+#: models.py:99
+msgid "Production"
+msgstr "Producción"
+
+#: models.py:105
+msgid "environment"
+msgstr "ambiente"
+
+#: models.py:115 models.py:140 models.py:181 models.py:200 models.py:226
+msgid "background color"
+msgstr "color de fondo"
+
+#: models.py:121 models.py:146 models.py:193 models.py:212 models.py:216
+msgid "text color"
+msgstr "color de texto"
+
+#: models.py:127 models.py:152 models.py:168
+msgid "link color"
+msgstr "color de enlace"
+
+#: models.py:133 models.py:158 models.py:174
+msgid "link hover color"
+msgstr "color de enlace (hover)"
+
+#: models.py:161 models.py:246
+msgid "rounded corners"
+msgstr "esquinas redondas"
+
+#: models.py:187 models.py:206
+msgid "background hover color"
+msgstr "color de fondo (hover)"
+
+#: models.py:243
+msgid "background opacity"
+msgstr "opacidad de fondo"
+
+#: models.py:250
+msgid "use dropdown"
+msgstr "Usar lista desplegable"
+
+#: models.py:262
+msgid "Theme"
+msgstr "Tema"
+
+#: models.py:263
+msgid "Themes"
+msgstr "Temas"
+
+#: templates/admin/filter.html:13
+#: templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Por %(filter_title)s "
+
+#: templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Cerando popup..."

admin_interface/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,186 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-01-07 11:23-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: admin.py:19
+msgid "Environment"
+msgstr "Environnment"
+
+#: admin.py:26
+msgid "Logo"
+msgstr "Logo"
+
+#: admin.py:34
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin.py:38
+msgid "Title"
+msgstr "Titre"
+
+#: admin.py:46
+msgid "Header"
+msgstr "Bannière"
+
+#: admin.py:55
+msgid "Breadcrumbs / Module headers"
+msgstr "Fil d'ariane / en-têtes de module"
+
+#: admin.py:65
+msgid "Generic Links"
+msgstr "Liens génériques"
+
+#: admin.py:72
+msgid "Save Buttons"
+msgstr "Boutons sauvegarder"
+
+#: admin.py:80
+msgid "Delete Buttons"
+msgstr "Boutons supprimer"
+
+#: admin.py:88
+msgid "Related Modal"
+msgstr "Modale pour objet reliés"
+
+#: admin.py:97
+msgid "List Filter"
+msgstr "Filtre de liste"
+
+#: admin.py:101
+msgid "Recent Actions"
+msgstr "Actions récentes"
+
+#: apps.py:11
+msgid "Admin Interface"
+msgstr "Interface Admin"
+
+#: models.py:54
+msgid "name"
+msgstr "nom"
+
+#: models.py:57 models.py:220
+msgid "active"
+msgstr "actif"
+
+#: models.py:61 templates/admin/base_site.html:6
+#: templates/admin/base_site.html:66
+msgid "Django administration"
+msgstr "Administration Django"
+
+#: models.py:63
+msgid "title"
+msgstr "titre"
+
+#: models.py:69
+msgid "title color"
+msgstr "couleur du titre"
+
+#: models.py:72 models.py:87 models.py:108 models.py:253
+msgid "visible"
+msgstr "visible"
+
+#: models.py:77
+msgid "Leave blank to use the default Django logo"
+msgstr "Laisser vide pour utiliser le logo Django par défaut"
+
+#: models.py:78
+msgid "logo"
+msgstr "logo"
+
+#: models.py:84
+msgid "logo color"
+msgstr "couleur du logo"
+
+#: models.py:92
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "(.ico|.png|.gif - 16x16|32x32 px)"
+
+#: models.py:93
+msgid "favicon"
+msgstr "favicon"
+
+#: models.py:96
+msgid "Development"
+msgstr "Développement"
+
+#: models.py:97
+msgid "Testing"
+msgstr "Test"
+
+#: models.py:98
+msgid "Staging"
+msgstr "Pré-prod"
+
+#: models.py:99
+msgid "Production"
+msgstr "Production"
+
+#: models.py:105
+msgid "environment"
+msgstr "environment"
+
+#: models.py:115 models.py:140 models.py:181 models.py:200 models.py:226
+msgid "background color"
+msgstr "couleur d'arrière-plan"
+
+#: models.py:121 models.py:146 models.py:193 models.py:212 models.py:216
+msgid "text color"
+msgstr "couleur du texte"
+
+#: models.py:127 models.py:152 models.py:168
+msgid "link color"
+msgstr "couleur de lien"
+
+#: models.py:133 models.py:158 models.py:174
+msgid "link hover color"
+msgstr "couleur de lien au survol"
+
+#: models.py:161 models.py:246
+msgid "rounded corners"
+msgstr "coins arrondis"
+
+#: models.py:187 models.py:206
+msgid "background hover color"
+msgstr "couleur de fond au survol"
+
+#: models.py:243
+msgid "background opacity"
+msgstr "opacité de l'arrière-plan"
+
+#: models.py:250
+msgid "use dropdown"
+msgstr "utiliser un menu déroulant"
+
+#: models.py:262
+msgid "Theme"
+msgstr "Thème"
+
+#: models.py:263
+msgid "Themes"
+msgstr "Thèmes"
+
+#: templates/admin/filter.html:13
+#: templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Par %(filter_title)s "
+
+#: templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Fermeture de la modale..."

admin_interface/locale/it/LC_MESSAGES/django.po

@@ -0,0 +1,187 @@
+# This file is distributed under the same license as the
+# django-admin-interface package.
+#
+# Translators:
+# Fabio Caccamo, 2019
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: django-admin-interface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-01-07 11:23-0500\n"
+"PO-Revision-Date: 2019-01-04 11:00-0000\n"
+"Last-Translator: Fabio Caccamo\n"
+"Language-Team: Italian\n"
+"Language: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:19
+msgid "Environment"
+msgstr "Ambiente"
+
+#: admin.py:26
+msgid "Logo"
+msgstr "Logo"
+
+#: admin.py:34
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin.py:38
+msgid "Title"
+msgstr "Titolo"
+
+#: admin.py:46
+msgid "Header"
+msgstr "Header"
+
+#: admin.py:55
+msgid "Breadcrumbs / Module headers"
+msgstr "Breadcrumbs / Header dei moduli"
+
+#: admin.py:65
+msgid "Generic Links"
+msgstr "Link generici"
+
+#: admin.py:72
+msgid "Save Buttons"
+msgstr "Pulsanti per salvare"
+
+#: admin.py:80
+msgid "Delete Buttons"
+msgstr "Pulsanti per eliminare"
+
+#: admin.py:88
+msgid "Related Modal"
+msgstr "Modale per gli oggetti correlati"
+
+#: admin.py:97
+msgid "List Filter"
+msgstr "Filtro listato"
+
+#: admin.py:101
+msgid "Recent Actions"
+msgstr "Azioni recenti"
+
+#: apps.py:11
+msgid "Admin Interface"
+msgstr "Interfaccia di admin"
+
+#: models.py:54
+msgid "name"
+msgstr "Nome"
+
+#: models.py:57 models.py:220
+msgid "active"
+msgstr "Attivo"
+
+#: models.py:61 templates/admin/base_site.html:6
+#: templates/admin/base_site.html:66
+msgid "Django administration"
+msgstr "Amministrazione di Django"
+
+#: models.py:63
+msgid "title"
+msgstr "Titolo"
+
+#: models.py:69
+msgid "title color"
+msgstr "Colore del titolo"
+
+#: models.py:72 models.py:87 models.py:108 models.py:253
+msgid "visible"
+msgstr "Visibile"
+
+#: models.py:77
+msgid "Leave blank to use the default Django logo"
+msgstr "Lasciare vuoto per usare il logo Django di default"
+
+#: models.py:78
+msgid "logo"
+msgstr "logo"
+
+#: models.py:84
+msgid "logo color"
+msgstr "colore del logo"
+
+#: models.py:92
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "Formato ico, png o gif. Dimensioni 16x16 o 32x32 px"
+
+#: models.py:93
+msgid "favicon"
+msgstr "favicon"
+
+#: models.py:96
+msgid "Development"
+msgstr "Sviluppo"
+
+#: models.py:97
+msgid "Testing"
+msgstr "Testing"
+
+#: models.py:98
+msgid "Staging"
+msgstr "Staging"
+
+#: models.py:99
+msgid "Production"
+msgstr "Produzione"
+
+#: models.py:105
+msgid "environment"
+msgstr "ambiente"
+
+#: models.py:115 models.py:140 models.py:181 models.py:200 models.py:226
+msgid "background color"
+msgstr "colore di sfondo"
+
+#: models.py:121 models.py:146 models.py:193 models.py:212 models.py:216
+msgid "text color"
+msgstr "color del testo"
+
+#: models.py:127 models.py:152 models.py:168
+msgid "link color"
+msgstr "color dei link"
+
+#: models.py:133 models.py:158 models.py:174
+msgid "link hover color"
+msgstr "color dei link in hover"
+
+#: models.py:161 models.py:246
+msgid "rounded corners"
+msgstr "bordi arrotondati"
+
+#: models.py:187 models.py:206
+msgid "background hover color"
+msgstr "colore di sfondo in hover"
+
+#: models.py:243
+msgid "background opacity"
+msgstr "opacità dello sfondo"
+
+#: models.py:250
+msgid "use dropdown"
+msgstr "Usa dropdown"
+
+#: models.py:262
+msgid "Theme"
+msgstr "Tema"
+
+#: models.py:263
+msgid "Themes"
+msgstr "Temi"
+
+#: templates/admin/filter.html:13
+#: templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Per %(filter_title)s "
+
+#: templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Chiusura popup..."

admin_interface/models.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-
 from __future__ import unicode_literals
 
 from django.db import models
 from django.db.models.signals import post_delete, post_save
 from django.utils.encoding import python_2_unicode_compatible, force_text
+from django.utils.translation import ugettext_lazy as _
 
 from colorfield.fields import ColorField
 
@@ -28,7 +28,6 @@ class Theme(models.Model):
 
     @staticmethod
     def get_active_theme():
-
         objs_active_qs = Theme.objects.filter(active=True)
         objs_active_ls = list(objs_active_qs)
         objs_active_count = len(objs_active_ls)
@@ -49,105 +48,182 @@ class Theme(models.Model):
 
         return obj
 
-    name = models.CharField(max_length=50, default='Django')
-    active = models.BooleanField(default=True)
+    name = models.CharField(
+        max_length=50,
+        default='Django',
+        verbose_name=_('name'))
+    active = models.BooleanField(
+        default=True,
+        verbose_name=_('active'))
 
     title = models.CharField(
-        max_length=50, default='Django administration', blank=True)
+        max_length=50,
+        default=_('Django administration'),
+        blank=True,
+        verbose_name=_('title'))
     title_color = ColorField(
-        blank=True, default='#F5DD5D', help_text='#F5DD5D',
-        max_length=10, verbose_name='title color')
+        blank=True,
+        default='#F5DD5D',
+        help_text='#F5DD5D',
+        max_length=10,
+        verbose_name=_('title color'))
     title_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        default=True,
+        verbose_name=_('visible'))
 
     logo = models.FileField(
-        upload_to='admin-interface/logo/', blank=True,
-        help_text='(leave blank to use the default Django logo)')
+        upload_to='admin-interface/logo/',
+        blank=True,
+        help_text=_('Leave blank to use the default Django logo'),
+        verbose_name=_('logo'))
     logo_color = ColorField(
-        blank=True, default='#FFFFFF', help_text='#FFFFFF',
-        max_length=10, verbose_name='logo color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('logo color'))
     logo_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        default=True,
+        verbose_name=_('visible'))
 
     favicon = models.FileField(
-        upload_to='admin-interface/favicon/', blank=True,
-        help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')
+        upload_to='admin-interface/favicon/',
+        blank=True,
+        help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
+        verbose_name=_('favicon'))
 
     env_choices = (
-        ('development', 'Development', ),
-        ('testing', 'Testing', ),
-        ('staging', 'Staging', ),
-        ('production', 'Production', ),
+        ('development', _('Development'), ),
+        ('testing', _('Testing'), ),
+        ('staging', _('Staging'), ),
+        ('production', _('Production'), ),
     )
     env = models.CharField(
         max_length=50,
         choices=env_choices,
-        default='development', verbose_name='enviroment')
+        default='development',
+        verbose_name=_('environment'))
     env_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        default=True,
+        verbose_name=_('visible'))
 
     css_header_background_color = ColorField(
-        blank=True, default='#0C4B33', help_text='#0C4B33',
-        max_length=10, verbose_name='background color')
+        blank=True,
+        default='#0C4B33',
+        help_text='#0C4B33',
+        max_length=10,
+        verbose_name=_('background color'))
     css_header_text_color = ColorField(
-        blank=True, default='#44B78B', help_text='#44B78B',
-        max_length=10, verbose_name='text color')
+        blank=True,
+        default='#44B78B',
+        help_text='#44B78B',
+        max_length=10,
+        verbose_name=_('text color'))
     css_header_link_color = ColorField(
-        blank=True, default='#FFFFFF', help_text='#FFFFFF',
-        max_length=10, verbose_name='link color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('link color'))
     css_header_link_hover_color = ColorField(
-        blank=True, default='#C9F0DD', help_text='#C9F0DD',
-        max_length=10, verbose_name='link hover color')
+        blank=True,
+        default='#C9F0DD',
+        help_text='#C9F0DD',
+        max_length=10,
+        verbose_name=_('link hover color'))
 
     css_module_background_color = ColorField(
-        blank=True, default='#44B78B', help_text='#44B78B',
-        max_length=10, verbose_name='background color')
+        blank=True,
+        default='#44B78B',
+        help_text='#44B78B',
+        max_length=10,
+        verbose_name=_('background color'))
     css_module_text_color = ColorField(
-        blank=True, default='#FFFFFF', help_text='#FFFFFF',
-        max_length=10, verbose_name='text color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))
     css_module_link_color = ColorField(
-        blank=True, default='#FFFFFF', help_text='#FFFFFF',
-        max_length=10, verbose_name='link color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('link color'))
     css_module_link_hover_color = ColorField(
-        blank=True, default='#C9F0DD', help_text='#C9F0DD',
-        max_length=10, verbose_name='link hover color')
+        blank=True,
+        default='#C9F0DD',
+        help_text='#C9F0DD',
+        max_length=10,
+        verbose_name=_('link hover color'))
     css_module_rounded_corners = models.BooleanField(
-        default=True, verbose_name='rounded corners')
+        default=True,
+        verbose_name=_('rounded corners'))
 
     css_generic_link_color = ColorField(
-        blank=True, default='#0C3C26', help_text='#0C3C26',
-        max_length=10, verbose_name='link color')
+        blank=True,
+        default='#0C3C26',
+        help_text='#0C3C26',
+        max_length=10,
+        verbose_name=_('link color'))
     css_generic_link_hover_color = ColorField(
-        blank=True, default='#156641', help_text='#156641',
-        max_length=10, verbose_name='link hover color')
+        blank=True,
+        default='#156641',
+        help_text='#156641',
+        max_length=10,
+        verbose_name=_('link hover color'))
 
     css_save_button_background_color = ColorField(
-        blank=True, default='#0C4B33', help_text='#0C4B33',
-        max_length=10, verbose_name='background color')
+        blank=True,
+        default='#0C4B33',
+        help_text='#0C4B33',
+        max_length=10,
+        verbose_name=_('background color'))
     css_save_button_background_hover_color = ColorField(
-        blank=True, default='#0C3C26', help_text='#0C3C26',
-        max_length=10, verbose_name='background hover color')
+        blank=True,
+        default='#0C3C26',
+        help_text='#0C3C26',
+        max_length=10,
+        verbose_name=_('background hover color'))
     css_save_button_text_color = ColorField(
-        blank=True, default='#FFFFFF', help_text='#FFFFFF',
-        max_length=10, verbose_name='text color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))
 
     css_delete_button_background_color = ColorField(
-        blank=True, default='#BA2121', help_text='#BA2121',
-        max_length=10, verbose_name='background color')
+        blank=True,
+        default='#BA2121',
+        help_text='#BA2121',
+        max_length=10,
+        verbose_name=_('background color'))
     css_delete_button_background_hover_color = ColorField(
-        blank=True, default='#A41515', help_text='#A41515',
-        max_length=10, verbose_name='background hover color')
+        blank=True,
+        default='#A41515',
+        help_text='#A41515',
+        max_length=10,
+        verbose_name=_('background hover color'))
     css_delete_button_text_color = ColorField(
-        blank=True, default='#FFFFFF', help_text='#FFFFFF',
-        max_length=10, verbose_name='text color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))
 
-    css = models.TextField(blank=True)
+    css = models.TextField(
+        blank=True,
+        verbose_name=_('text color'))
 
     related_modal_active = models.BooleanField(
-        default=True, verbose_name='active')
+        default=True,
+        verbose_name=_('active'))
     related_modal_background_color = ColorField(
-        blank=True, default='#000000', help_text='#000000',
-        max_length=10, verbose_name='background color')
+        blank=True,
+        default='#000000',
+        help_text='#000000',
+        max_length=10,
+        verbose_name=_('background color'))
     related_modal_background_opacity_choices = (
         ('0.1', '10%', ),
         ('0.2', '20%', ),
@@ -162,26 +238,29 @@ class Theme(models.Model):
     related_modal_background_opacity = models.CharField(
         max_length=5,
         choices=related_modal_background_opacity_choices,
-        default='0.3', help_text='20%', verbose_name='background opacity')
+        default='0.3',
+        help_text='20%',
+        verbose_name=_('background opacity'))
     related_modal_rounded_corners = models.BooleanField(
-        default=True, verbose_name='rounded corners')
+        default=True,
+        verbose_name=_('rounded corners'))
 
     list_filter_dropdown = models.BooleanField(
-        default=False, verbose_name='use dropdown')
+        default=False,
+        verbose_name=_('use dropdown'))
     recent_actions_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        default=True,
+        verbose_name=_('visible'))
 
     def set_active(self):
-
         self.active = True
         self.save()
 
     class Meta:
-
         app_label = 'admin_interface'
 
-        verbose_name = 'Theme'
-        verbose_name_plural = 'Themes'
+        verbose_name = _('Theme')
+        verbose_name_plural = _('Themes')
 
     def __str__(self):
         return force_text(self.name)

admin_interface/settings.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+import django
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+
+
+def check_installed_apps():
+    dj_version = django.VERSION
+    installed_apps = settings.INSTALLED_APPS
+
+    if 'colorfield' not in installed_apps:
+        raise ImproperlyConfigured(
+            '\'colorfield\' needed, '
+            'add it to settings.INSTALLED_APPS.')
+
+    if dj_version < (1, 9):
+        if 'flat' not in installed_apps:
+            raise ImproperlyConfigured(
+                '\'flat\' needed before django 1.9, '
+                'add it to settings.INSTALLED_APPS.')
+    else:
+        if 'flat' in installed_apps:
+            raise ImproperlyConfigured(
+                '\'flat\' not needed since django 1.9, '
+                'remove it from settings.INSTALLED_APPS.')
+
+    if dj_version < (2, 0):
+        if 'flat_responsive' not in installed_apps:
+            raise ImproperlyConfigured(
+                '\'flat_responsive\' needed before django 2.0, '
+                'add it to settings.INSTALLED_APPS.')
+    else:
+        if 'flat_responsive' in installed_apps:
+            raise ImproperlyConfigured(
+                '\'flat_responsive\' not needed since django 2.0, '
+                'remove it from settings.INSTALLED_APPS.')

admin_interface/static/admin/js/cancel.js

@@ -0,0 +1,24 @@
+if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
+{
+    (function($) {
+
+        'use strict';
+
+        $(document).ready(function() {
+
+            $('.cancel-link').click(function(e) {
+                e.preventDefault();
+                var parentWindow = window.parent;
+                if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function') {
+                    parentWindow.dismissRelatedObjectModal();
+                } else {
+                    // fallback to default behavior
+                    history.back();
+                }
+                return false;
+            });
+
+        });
+
+    })(django.jQuery);
+}

admin_interface/static/admin/js/popup_response.js

@@ -1,5 +1,5 @@
-/* global opener */
 (function() {
+
     'use strict';
 
     function getModalWindowData()
@@ -29,24 +29,24 @@
     // console.log(initData);
     switch (initData.action) {
         case 'change':
-            if (typeof(openerRef.dismissChangeRelatedObjectPopup) == 'function') {
+            if (typeof(openerRef.dismissChangeRelatedObjectPopup) === 'function') {
                 openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
             }
             break;
         case 'delete':
-            if (typeof(openerRef.dismissDeleteRelatedObjectPopup) == 'function') {
+            if (typeof(openerRef.dismissDeleteRelatedObjectPopup) === 'function') {
                 openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
             }
             break;
         default:
-            if (typeof(openerRef.dismissAddRelatedObjectPopup) == 'function') {
+            if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
                 openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
             }
-            else if (typeof(openerRef.dismissAddAnotherPopup) == 'function') {
+            else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
                 // django 1.7 compatibility
                 openerRef.dismissAddAnotherPopup(modalRef, initData.value, initData.obj);
             }
             break;
     }
-})();
 
+})();

admin_interface/static/admin_interface/related-modal/related-modal.js

@@ -61,7 +61,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                     // create a random parameter and append it to the src url to prevent it
                     // this workaround doesn't work with related lookup url
                     var iframeSrcRandom = String(Math.round(Math.random() * 999999));
-                    if( iframeSrc.indexOf('?') === -1 ){
+                    if (iframeSrc.indexOf('?') === -1) {
                         iframeSrc += '?_modal=' + iframeSrcRandom;
                     } else {
                         iframeSrc += '&_modal=' + iframeSrcRandom;
@@ -86,7 +86,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                 {
                     // set current window as iframe opener because
                     // the callback is called on the opener window
-                    iframeEl.load(function(){
+                    iframeEl.on('load', function() {
                         var iframeObj = $(this).get(0);
                         var iframeWindow = iframeObj.contentWindow;
                         iframeWindow.opener = window;
@@ -129,5 +129,4 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
         });
 
     })(django.jQuery);
-}
-
+}

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.7.0'
+__version__ = '0.9.0'

setup.py

@@ -46,6 +46,7 @@ setup(
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
@@ -56,6 +57,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Build Tools',
     ],
     license='MIT',

tests/settings.py

@@ -9,24 +9,46 @@ SECRET_KEY = 'django-admin-interface'
 
 ALLOWED_HOSTS = ['*']
 
+# Application definition
 INSTALLED_APPS = [
-
     'admin_interface',
-    'flat_responsive',
-    'flat', #if django version < 1.9
     'colorfield',
+]
 
+if django.VERSION < (1, 9):
+    # ONLY if django version < 1.9
+    INSTALLED_APPS += [
+        'flat',
+    ]
+
+if django.VERSION < (2, 0):
+    # ONLY if django version < 2.0
+    INSTALLED_APPS += [
+        'flat_responsive',
+    ]
+
+INSTALLED_APPS += [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.messages',
     'django.contrib.sessions',
 ]
 
-MIDDLEWARE_CLASSES = [
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-]
+if django.VERSION < (2, 0):
+    MIDDLEWARE_CLASSES = [
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware'
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ]
+else:
+    MIDDLEWARE = [
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ]
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -35,6 +57,7 @@ TEMPLATES = [{
     'OPTIONS': {
         'context_processors': [
             'django.contrib.auth.context_processors.auth',
+            'django.contrib.messages.context_processors.messages',
         ]
     },
 },]

tests/test_settings.py

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+
+import django
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.test import override_settings, TestCase
+
+from admin_interface.settings import check_installed_apps
+
+
+class AdminInterfaceSettingsTestCase(TestCase):
+
+    DJANGO_APPS = [
+        'django.contrib.admin',
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.messages',
+        'django.contrib.sessions',
+    ]
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def __test_installed_apps(self):
+        dj_version = django.VERSION
+        installed_apps = settings.INSTALLED_APPS
+
+        if 'colorfield' not in installed_apps:
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat' not in installed_apps and dj_version < (1, 9):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat' in installed_apps and dj_version >= (1, 9):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat_responsive' not in installed_apps and dj_version < (2, 0):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat_responsive' in installed_apps and dj_version >= (2, 0):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        else:
+            check_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            'colorfield',
+            'flat',
+            'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_all(self):
+        self.__test_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            # 'colorfield',
+            'flat',
+            'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_no_colorfield(self):
+        self.__test_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            'colorfield',
+            # 'flat',
+            'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_no_flat(self):
+        self.__test_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            'colorfield',
+            'flat',
+            # 'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_no_flat_responsive(self):
+        self.__test_installed_apps()
+

tox.ini

@@ -1,20 +1,21 @@
 [tox]
 envlist =
-    py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111,20,21},
-    py35-{18,19,110,111,20,21,master},
-    py36-{18,19,110,111,20,21,master},
+    py27-{dj17,dj18,dj19,dj110,dj111},
+    py34-{dj17,dj18,dj19,dj110,dj111,dj20},
+    py35-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster},
+    py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster},
+    py37-{dj20,dj21,djmaster},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    17: Django >= 1.7, < 1.8
-    18: Django >= 1.8, < 1.9
-    19: Django >= 1.9, < 1.10
-    110: Django >= 1.10, < 1.11
-    111: Django >= 1.11, < 1.12
-    20: Django >= 2.0, < 2.1
-    21: Django >= 2.1, < 2.2
-    master: https://github.com/django/django/archive/master.tar.gz
+    dj17: Django >= 1.7, < 1.8
+    dj18: Django >= 1.8, < 1.9
+    dj19: Django >= 1.9, < 1.10
+    dj110: Django >= 1.10, < 1.11
+    dj111: Django >= 1.11, < 1.12
+    dj20: Django >= 2.0, < 2.1
+    dj21: Django >= 2.1, < 2.2
+    djmaster: https://github.com/django/django/archive/master.tar.gz
     coverage
     codecov
 commands =