From d810dc38a3cfd8e3eb74ec43a12c5168518d22c2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 3 Sep 2013 19:48:12 +0200 Subject: i18n to change language (refs #1383) --- example_project/settings.py | 5 +++-- ishtar_common/static/media/style.css | 17 +++++++++++++++-- ishtar_common/templates/base.html | 36 ++++++++++++++++++++---------------- ishtar_common/urls.py | 2 +- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/example_project/settings.py b/example_project/settings.py index 40aa25066..d45770277 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -55,8 +55,8 @@ USE_I18N = True # calendars according to the current locale USE_L10N = True LANGUAGES = ( - ('fr', _('Français')), - ('en', _('Anglais')), + ('fr', u'Français'), + ('en', u'English'), ) DEFAULT_LANGUAGE = 1 @@ -82,6 +82,7 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.locale.LocaleMiddleware', ] TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index d9bcd73e7..a219160f2 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -133,16 +133,18 @@ div.nav-button{ div#header{ width:100%; - text-align:center; + text-align:left; font-size: 0.9em; background-color: #EEE; border-bottom:1px solid #CCC; margin-bottom:10px; + line-height:30px; + padding:0 20px; } div#logo{ width:200px; - top:30px; + top:40px; left:30px; padding-top:90px; position:absolute; @@ -151,6 +153,17 @@ div#logo{ background-repeat:no-repeat; } +div#language_form_div{ + position:absolute; + right:0; + top:0; + padding:2px 20px; +} + +div#language_form_div label{ + display:inline; +} + div#context_menu{ height:110px; margin-left:200px; diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 0d0df59e5..60821dee6 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -22,23 +22,27 @@