Fix wrong translations in forms/ models

Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)

openslides/agenda/forms.py

@@ -12,11 +12,11 @@
 
 from django.forms import Form, ModelForm, IntegerField, ChoiceField, \
                          ModelChoiceField, HiddenInput, Select, TextInput
-from django.utils.translation import ugettext as _
 
 from mptt.forms import TreeNodeChoiceField
 
 from utils.forms import CssClassMixin
+from utils.translation_ext import ugettext as _
 
 from agenda.models import Item
 

openslides/application/forms.py

@@ -12,9 +12,9 @@
 
 from django.forms import ModelForm, Form, CharField, Textarea, TextInput, ModelMultipleChoiceField, ModelChoiceField, BooleanField, FileField, FileInput, IntegerField, ChoiceField, Select
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
 
 from utils.forms import CssClassMixin
+from utils.translation_ext import ugettext as _
 from application.models import Application
 
 

openslides/application/urls.py

@@ -11,7 +11,6 @@
 """
 
 from django.conf.urls.defaults import url, patterns
-from django.utils.translation import ugettext as _
 
 from application.views import ApplicationDelete, ViewPoll, ApplicationPDF, ApplicationPollPDF, CreateAgendaItem
 

openslides/assignment/forms.py

@@ -12,9 +12,9 @@
 
 from django import forms
 from django.forms import ModelForm, Form, ModelChoiceField, Select
-from django.utils.translation import ugettext as _
 
 from utils.forms import CssClassMixin
+from utils.translation_ext import ugettext as _
 from participant.models import Profile
 from assignment.models import Assignment
 

openslides/config/forms.py

@@ -11,10 +11,10 @@
 """
 
 from django.forms import Form, CharField, TextInput, BooleanField, IntegerField, ChoiceField, Textarea, Select
-from django.utils.translation import ugettext as _
 
 from utils.forms import CssClassMixin
 from models import config
+from utils.translation_ext import ugettext as _
 
 
 class GeneralConfigForm(Form, CssClassMixin):
@@ -25,4 +25,4 @@ class GeneralConfigForm(Form, CssClassMixin):
     event_organizer = CharField(widget=TextInput(), required=False, label=_("Event organizer"))
     system_enable_anonymous = BooleanField(required=False, label=_("Allow access for anonymous guest users") )
     frontpage_title = CharField(widget=TextInput(), required=False, label=_("Title") )
-    frontpage_welcometext = CharField(widget=Textarea(), required=False, label=_("Welcome text") )
+    frontpage_welcometext = CharField(widget=Textarea(), required=False, label=_("Welcome text") )

openslides/participant/forms.py

@@ -13,10 +13,9 @@
 from django.forms import Form, ModelForm, CharField, EmailField, FileField, FileInput, TextInput, Textarea, MultipleChoiceField, ModelMultipleChoiceField, ChoiceField, BooleanField
 from django.contrib.auth.models import User, Group, Permission
 from django.contrib.auth.forms import AdminPasswordChangeForm
-from django.utils.translation import ugettext as _
 
 from utils.forms import CssClassMixin
-from utils.translation_ext import LocalizedModelMultipleChoiceField
+from utils.translation_ext import LocalizedModelMultipleChoiceField, ugettext as _
 
 # required for USER_VISIBLE_PERMISSIONS
 from participant.models import Profile

openslides/poll/forms.py

@@ -11,9 +11,9 @@
 """
 
 from django import forms
-from django.utils.translation import ugettext as _
 
 from utils.forms import CssClassMixin
+from utils.translation_ext import ugettext as _
 from models import Vote
 
 

openslides/projector/projector.py

@@ -13,7 +13,6 @@
 from time import time
 
 from django.dispatch import receiver
-from django.utils.translation import ugettext as _
 
 from config.models import config
 

openslides/utils/translation_ext.py

@@ -10,7 +10,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from django.utils.translation import ugettext as _ugettext
+from django.utils.translation import ugettext_lazy
 from django.forms import ChoiceField, ModelChoiceField, ModelMultipleChoiceField
 
 
@@ -53,4 +53,4 @@ def ugettext(msg, fixstr=False):
     if fixstr:
         return msg
     else:
-        return _ugettext(msg)
+        return ugettext_lazy(msg)

openslides/utils/utils.py

@@ -23,10 +23,10 @@ from django.template.loader import render_to_string
 from django.core.context_processors import csrf
 from django.contrib import messages
 from django.contrib.auth.models import Permission
-from django.utils.translation import ugettext as _
 from django.db.models import signals
 
 from openslides.utils.signals import template_manipulation
+from openslides.utils.translation_ext import ugettext as _
 
 from openslides import get_version