fnp
/
django-migdal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e785125
..
b3e09da
100644
(file)
--- a/
migdal/__init__.py
+++ b/
migdal/__init__.py
@@
-45,9
+45,16
@@
class Settings(AppSettings):
OBLIGATORY_LANGUAGES = None
def _more_OPTIONAL_LANGUAGES(self, value):
OBLIGATORY_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
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')
PUBLISH_DATE_EDITABLE = False
app_settings = Settings('MIGDAL')