Consistent use of languages settings, and Django 1.10 fixes.

[django-migdal.git] / migdal / __init__.py

diff --git a/migdal/__init__.py b/migdal/__init__.py
index fe90406..b3e09da 100644 (file)
--- a/migdal/__init__.py
+++ b/migdal/__init__.py
@@ -17,6 +17,7 @@ class Settings(AppSettings):
             EntryType('news', _('news'), commentable=True, on_main=True, promotable=True),
             EntryType('publications', _('publications')),
             EntryType('info', _('info')),
+            EntryType('event', _('events')),
         )
     TYPE_SUBMIT = 'news'
     TAXONOMIES = (
@@ -27,26 +28,33 @@ class Settings(AppSettings):
 
     MAIN_PAGE_ENTRY = None
 
-    TYPES_DICT = None
     def _more_TYPES_DICT(self, value):
         return dict((t.db, t) for t in self.TYPES)
+    TYPES_DICT = None
 
-    TYPES_ON_MAIN = None
     def _more_TYPES_ON_MAIN(self, value):
         return tuple(t.db for t in self.TYPES if t.on_main)
+    TYPES_ON_MAIN = None
 
-    TYPES_PROMOTABLE = None
     def _more_TYPES_PROMOTABLE(self, value):
         return tuple(t.db for t in self.TYPES if t.promotable)
+    TYPES_PROMOTABLE = None
 
-    OBLIGATORY_LANGUAGES = None
     def _more_OBLIGATORY_LANGUAGES(self, value):
-        return value or tuple(lang for lang in settings.LANGUAGES
-                        if lang[0] == settings.LANGUAGE_CODE)
+        return value or tuple(lang for lang in settings.LANGUAGES if lang[0] == settings.LANGUAGE_CODE)
+    OBLIGATORY_LANGUAGES = None
 
-    OPTIONAL_LANGUAGES = None
     def _more_OPTIONAL_LANGUAGES(self, value):
-        return tuple(lang for lang in settings.LANGUAGES
-                        if lang not in self.OBLIGATORY_LANGUAGES)
+        if value is None:
+            return tuple(lang for lang in settings.LANGUAGES if lang not in self.OBLIGATORY_LANGUAGES)
+        else:
+            return value
+    OPTIONAL_LANGUAGES = None
+
+    def _more_LANGUAGES(self, value):
+        return self.OBLIGATORY_LANGUAGES + self.OPTIONAL_LANGUAGES
+    LANGUAGES = None
+
+    PUBLISH_DATE_EDITABLE = False
 
 app_settings = Settings('MIGDAL')