@@ -68,7 +68,7 @@
{% if os_enable_anonymous_login %}
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 310cbf04c..829402e89 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -90,19 +90,19 @@
-
+
{% if user != request_user %}
-
+
{% endif %}
{% if user != request_user and not user.is_superuser %}
-
+
-
+
{% endif %}
diff --git a/openslides/participant/templates/participant/password_change.html b/openslides/participant/templates/participant/password_change.html
index 491aa987a..a31b5bb9a 100644
--- a/openslides/participant/templates/participant/password_change.html
+++ b/openslides/participant/templates/participant/password_change.html
@@ -7,8 +7,8 @@
{% block submenu %}
{% trans "User Settings" %}
{% endblock %}
diff --git a/openslides/participant/templates/participant/settings.html b/openslides/participant/templates/participant/settings.html
index 8c59157eb..54bcf94e0 100644
--- a/openslides/participant/templates/participant/settings.html
+++ b/openslides/participant/templates/participant/settings.html
@@ -7,8 +7,8 @@
{% block submenu %}
{% trans "User Settings" %}
{% endblock %}
diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html
index 00082aac7..ab762774e 100644
--- a/openslides/participant/templates/participant/user_widget.html
+++ b/openslides/participant/templates/participant/user_widget.html
@@ -4,7 +4,7 @@
{% for user in users %}
-
-
+
@@ -13,7 +13,7 @@
-
+
{{ user }}
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 34cb032a0..bae5f0a69 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -10,15 +10,8 @@
:license: GNU GPL, see LICENSE for more details.
"""
-# for python 2.5 support
-from __future__ import with_statement
-
from urllib import urlencode
-
-try:
- from urlparse import parse_qs
-except ImportError: # python <= 2.5 grab it from cgi
- from cgi import parse_qs
+from urlparse import parse_qs
from reportlab.lib import colors
from reportlab.lib.units import cm
@@ -31,7 +24,7 @@ from django.contrib.auth.forms import PasswordChangeForm
from django.contrib.auth.views import login as django_login
from django.core.urlresolvers import reverse
from django.shortcuts import redirect
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext as _, ugettext_lazy, activate
from openslides.utils.pdf import stylesheet
from openslides.utils.template import Tab
@@ -503,11 +496,15 @@ def user_settings(request):
form_user = UsersettingsForm(request.POST, instance=request.user)
if form_user.is_valid():
form_user.save()
+ language = request.LANGUAGE_CODE = \
+ request.session['django_language'] = form_user.cleaned_data['language']
+ activate(language)
messages.success(request, _('User settings successfully saved.'))
else:
messages.error(request, _('Please check the form for errors.'))
else:
- form_user = UsersettingsForm(instance=request.user)
+ language = request.session.get('django_language', request.LANGUAGE_CODE)
+ form_user = UsersettingsForm(instance=request.user, initial={'language': language})
return {
'form_user': form_user,
diff --git a/openslides/projector/templates/projector/base_projector.html b/openslides/projector/templates/projector/base_projector.html
index 2aae46a8d..93418c2cb 100644
--- a/openslides/projector/templates/projector/base_projector.html
+++ b/openslides/projector/templates/projector/base_projector.html
@@ -7,19 +7,19 @@
{% block title %}{{ block.super}} – {% trans 'Dashboard' %} {% endblock %}
{% block submenu %}
- {% url dashboard as url_dashboard %}
- {% url projector_select_widgets as url_select_widget %}
+ {% url 'dashboard' as url_dashboard %}
+ {% url 'projector_select_widgets' as url_select_widget %}
{% trans "Dashboard" %}
diff --git a/openslides/projector/templates/projector/control_countdown.html b/openslides/projector/templates/projector/control_countdown.html
index ec854d33d..1109596ad 100644
--- a/openslides/projector/templates/projector/control_countdown.html
+++ b/openslides/projector/templates/projector/control_countdown.html
@@ -4,16 +4,16 @@
{% trans "s" context "seconds" %}
-
-
+
+
-
+
-
-
+
+
-
-
+
+
diff --git a/openslides/projector/templates/projector/control_overlay_message.html b/openslides/projector/templates/projector/control_overlay_message.html
index 6741a3eff..2d7c631f7 100644
--- a/openslides/projector/templates/projector/control_overlay_message.html
+++ b/openslides/projector/templates/projector/control_overlay_message.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load tags %}
- |