summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/context_processors.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-02-02 17:16:54 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-02-02 17:16:54 +0100
commit6433f39eb437c068f3de33a8e7a19ae3ed9e941c (patch)
tree3e03ef36120c8d2bc635952600c0d3cef34163d6 /ishtar/furnitures/context_processors.py
parent6e76724c700da8a77cc64c96262c6a685ad5382b (diff)
downloadIshtar-6433f39eb437c068f3de33a8e7a19ae3ed9e941c.tar.bz2
Ishtar-6433f39eb437c068f3de33a8e7a19ae3ed9e941c.zip
Better management of the application name (using django Site application) - Change account activation email - Update french translation
Diffstat (limited to 'ishtar/furnitures/context_processors.py')
-rw-r--r--ishtar/furnitures/context_processors.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar/furnitures/context_processors.py b/ishtar/furnitures/context_processors.py
index f81b6f7c3..31ff816c5 100644
--- a/ishtar/furnitures/context_processors.py
+++ b/ishtar/furnitures/context_processors.py
@@ -18,6 +18,7 @@
# See the file COPYING for details.
from django.utils.translation import ugettext, ugettext_lazy as _
+from django.contrib.sites.models import Site
from ishtar import settings
from menus import Menu
@@ -25,8 +26,7 @@ import models
def get_base_context(request):
dct = {'URL_PATH':settings.URL_PATH}
- if settings.APP_NAME:
- dct["APP_NAME"] = settings.APP_NAME
+ dct["APP_NAME"] = Site.objects.get_current().name
dct["COUNTRY"] = settings.COUNTRY
if 'MENU' not in request.session or \
request.session['MENU'].user != request.user: