diff --git a/openslides/motion/__init__.py b/openslides/motion/__init__.py index e69de29bb..f7f3759f3 100644 --- a/openslides/motion/__init__.py +++ b/openslides/motion/__init__.py @@ -0,0 +1 @@ +import openslides.motion.signals diff --git a/openslides/motion/models.py b/openslides/motion/models.py index 65c73d326..600a5c59a 100644 --- a/openslides/motion/models.py +++ b/openslides/motion/models.py @@ -17,7 +17,7 @@ from django.db import models from django.db.models import Max from django.dispatch import receiver from django.utils.translation import pgettext -from django.utils.translation import ugettext_lazy as _, ugettext_noop, ugettext +from django.utils.translation import ugettext_lazy, ugettext_noop, ugettext as _ from openslides.utils.utils import _propper_unicode from openslides.utils.person import PersonField @@ -242,13 +242,13 @@ class Motion(SlideMixin, models.Model): class MotionVersion(models.Model): - title = models.CharField(max_length=255, verbose_name=_("Title")) + title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title")) text = models.TextField(verbose_name=_("Text")) - reason = models.TextField(null=True, blank=True, verbose_name=_("Reason")) + reason = models.TextField(null=True, blank=True, verbose_name=ugettext_lazy("Reason")) rejected = models.BooleanField(default=False) creation_time = models.DateTimeField(auto_now=True) motion = models.ForeignKey(Motion, related_name='versions') - identifier = models.CharField(max_length=255, verbose_name=_("Version identifier")) + identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier")) note = models.TextField(null=True, blank=True) def __unicode__(self): @@ -268,8 +268,8 @@ class MotionVersion(models.Model): class Category(models.Model): - name = models.CharField(max_length=255, verbose_name=_("Category name")) - prefix = models.CharField(max_length=32, verbose_name=_("Category prefix")) + name = models.CharField(max_length=255, verbose_name=ugettext_lazy("Category name")) + prefix = models.CharField(max_length=32, verbose_name=ugettext_lazy("Category prefix")) def __unicode__(self): return self.name diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py new file mode 100644 index 000000000..b73637485 --- /dev/null +++ b/openslides/motion/signals.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +""" + openslides.motion.signales + ~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Signals for the motion app. + + :copyright: 2011, 2012 by OpenSlides team, see AUTHORS. + :license: GNU GPL, see LICENSE for more details. +""" + +from django.dispatch import receiver +from django.utils.translation import ugettext as _ + +from openslides.config.signals import default_config_value + +@receiver(default_config_value, dispatch_uid="motion_default_config") +def default_config(sender, key, **kwargs): + return { + 'motion_min_supporters': 0, + 'motion_preamble': _('The assembly may decide,'), + 'motion_pdf_ballot_papers_selection': 'CUSTOM_NUMBER', + 'motion_pdf_ballot_papers_number': '8', + 'motion_pdf_title': _('Motions'), + 'motion_pdf_preamble': '', + 'motion_allow_trivial_change': False, + }.get(key) diff --git a/openslides/motion/templates/motion/config.html b/openslides/motion/templates/motion/config.html new file mode 100644 index 000000000..42e064444 --- /dev/null +++ b/openslides/motion/templates/motion/config.html @@ -0,0 +1,22 @@ +{% extends "config/base_config.html" %} + +{% load i18n %} + +{% block title %}{{ block.super }} – {% trans "Motion settings" %}{% endblock %} + +{% block content %} +