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

Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides

Browse Source 
Conflicts:
	openslides/assignment/models.py
This commit is contained in:
Oskar Hahn 2012-09-13 15:28:35 +02:00
commit 0cf0e58af9
4 changed files with 263 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/assignment/models.py
View File

@ -91,7 +91,7 @@ class Assignment(models.Model, SlideMixin):
# if the candidation is blocked and anotherone tries to run the # if the candidation is blocked and anotherone tries to run the
# candidate # candidate
raise NameError( raise NameError(
_('The %s does not want to be a candidate.') % candidate) _('%s does not want to be a candidate.') % candidate)
elif candidation: elif candidation:
candidation[0].blocked = False candidation[0].blocked = False
candidation[0].save() candidation[0].save()

BIN
openslides/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

620
openslides/locale/de/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

2
openslides/projector/views.py
View File

@ -400,7 +400,7 @@ def get_widgets(request):
context.update(csrf(request)) context.update(csrf(request))
widgets.append(Widget( widgets.append(Widget(
name='overlays', name='overlays',
display_name=_('Manage Overlays'), display_name=_('Overlays'),
template='projector/overlay_widget.html', template='projector/overlay_widget.html',
permission_required='projector.can_manage_projector', permission_required='projector.can_manage_projector',
default_column=2, default_column=2,