Merge pull request #1108 from emanuelschuetze/duration

Duration field and EN translation file

openslides/agenda/forms.py

@@ -27,7 +27,8 @@ class ItemForm(CleanHtmlFormMixin, CssClassMixin, forms.ModelForm):
         error_message=ugettext_lazy("Invalid format. Hours from 0 to 99 and minutes from 00 to 59"),
         max_length=5,
         required=False,
-        label=ugettext_lazy("Duration (hh:mm)"))
+        label=ugettext_lazy("Duration"),
+        help_text=ugettext_lazy('Input format: HH:MM or M or MM or MMM'))
 
     class Meta:
         model = Item

openslides/agenda/models.py

@@ -63,8 +63,7 @@ class Item(SlideMixin, MPTTModel):
     See Item.ITEM_TYPE for more information.
     """
 
-    duration = models.CharField(null=True, blank=True, max_length=5,
-                                verbose_name=ugettext_lazy("Duration (hh:mm)"))
+    duration = models.CharField(null=True, blank=True, max_length=5)
     """
     The intended duration for the topic.
     """

openslides/motion/views.py

@@ -661,7 +661,7 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
         if success:
             self.object.save(update_fields=['state', 'identifier'])
             self.object.write_log(
-                message_list=[ugettext_noop('State changed to'), ' %s' % self.object.state.name],  # TODO: Change string to 'State set to ...'
+                message_list=[ugettext_noop('State changed to'), ' ', self.object.state.name],  # TODO: Change string to 'State set to ...'
                 person=self.request.user)
             messages.success(request,
                              _('The state of the motion was set to %s.')