diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
| commit | 54b87741a26a2bd805ed32200b082ca07ee0e27d (patch) | |
| tree | 70302bf14268e6374fb1faf0438db01e57db01ae /ishtar_common/context_processors.py | |
| parent | 0ca23dab03f240b8e960b417aed4451c10b51402 (diff) | |
| parent | ac1c36d915d54ad4bef873a313fe04e2935c1fad (diff) | |
| download | Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.tar.bz2 Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.zip | |
Merge branch 'master' into v0.9
Conflicts:
CHANGES.txt
version.py
Diffstat (limited to 'ishtar_common/context_processors.py')
| -rw-r--r-- | ishtar_common/context_processors.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 76f58bf8e..f8a4a0f95 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -21,6 +21,7 @@ from django.conf import settings from django.contrib.sites.models import Site from django.utils.translation import ugettext_lazy as _ +from ishtar_common.version import VERSION from ishtar_common.utils import shortify from menus import Menu @@ -70,6 +71,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]) + if settings.EXTRA_VERSION: + dct['VERSION'] += unicode(settings.EXTRA_VERSION) dct['current_menu'] = [] for lbl, model in CURRENT_ITEMS: model_name = model.__name__.lower() |