ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1108 from emanuelschuetze/duration

Browse Source 
Duration field and EN translation file
This commit is contained in:
Norman Jäckel 2013-11-22 10:30:22 -08:00
commit 980ce56bc3
4 changed files with 279 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/agenda/forms.py
View File

@ -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"), error_message=ugettext_lazy("Invalid format. Hours from 0 to 99 and minutes from 00 to 59"),
max_length=5, max_length=5,
required=False, 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: class Meta:
model = Item model = Item

3
openslides/agenda/models.py
View File

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

537
openslides/locale/en/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

2
openslides/motion/views.py
View File

@ -661,7 +661,7 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
if success: if success:
self.object.save(update_fields=['state', 'identifier']) self.object.save(update_fields=['state', 'identifier'])
self.object.write_log( 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) person=self.request.user)
messages.success(request, messages.success(request,
_('The state of the motion was set to %s.') _('The state of the motion was set to %s.')