Merge pull request #1069 from ostcar/reset_passwort_question

Make sure QuestionView.get_question_message is in a unicode context.

openslides/utils/views.py

@@ -355,7 +355,7 @@ class QuestionView(RedirectView):
         """
         Returns the question.
         """
-        return self.question_message
+        return unicode(self.question_message)
 
     def get_answer_options(self):
         """
@@ -376,13 +376,10 @@ class QuestionView(RedirectView):
             for option in self.get_answer_options()])
         messages.warning(
             self.request,
-            """
-            %(message)s
-            <form action="%(url)s" method="post">
-                <input type="hidden" value="%(csrf)s" name="csrfmiddlewaretoken">
-                %(option_fields)s
-            </form>
-            """ % {'message': self.get_question_message(),
+            '%(message)s<form action="%(url)s" method="post">'
+            '<input type="hidden" value="%(csrf)s" name="csrfmiddlewaretoken">'
+            '%(option_fields)s</form>' % {
+                'message': self.get_question_message(),
                 'url': self.request.path,
                 'csrf': csrf(self.request)['csrf_token'],
                 'option_fields': option_fields})

tests/utils/test_views.py

@@ -164,6 +164,9 @@ class QuestionViewTest(ViewTestCase):
         view.question_message = 'new_question'
         self.assertEqual(get_question_message(), 'new_question')
 
+        # Make sure it is unicode, so ugettext_lazy can work
+        self.assertIsInstance(get_question_message(), unicode)
+
     def test_get_answer_options(self):
         view = views.QuestionView()
         get_answer_options = view.get_answer_options
@@ -186,6 +189,9 @@ class QuestionViewTest(ViewTestCase):
 
         self.assertTrue(mock_messages.warning.called)
 
+        question = mock_messages.warning.call_args[0][1]
+        self.assertIn('the question', question)
+
 
 def set_context(sender, request, context, **kwargs):
     """