diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
| commit | c8dd8eba4546961fa154c0ae386709750fcfffb4 (patch) | |
| tree | 613ea46830ed40c5b9b031ba54664f05cfe98b75 /ishtar_common/context_processors.py | |
| parent | c1e94dc1b8851b61bc8d697e08f8a407b5269365 (diff) | |
| parent | 219a775ed06ba6e75b2a9a04af406aea3ef579bb (diff) | |
| download | Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.tar.bz2 Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/context_processors.py')
| -rw-r--r-- | ishtar_common/context_processors.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 47cbac02d..8e14d8506 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -20,7 +20,7 @@ from django.conf import settings from django.contrib.sites.models import Site -from ishtar_common.version import VERSION +from ishtar_common.version import __version__ from ishtar_common.models import get_current_profile from menus import Menu @@ -54,9 +54,9 @@ def get_base_context(request): dct['JQUERY_URL'] = settings.JQUERY_URL dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL dct['COUNTRY'] = settings.COUNTRY - dct['VERSION'] = u".".join([unicode(n) for n in VERSION]) + dct['VERSION'] = __version__ if settings.EXTRA_VERSION: - dct['VERSION'] += unicode(settings.EXTRA_VERSION) + dct['VERSION'] += "-" + unicode(settings.EXTRA_VERSION) profile = get_current_profile() if profile: dct['raw_css'] = profile.get_raw_css() |