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

Merge pull request #2242 from matakuka/translations

Browse Source 
translations (fixes #2197)
This commit is contained in:
Norman Jäckel 2016-08-02 19:03:59 +02:00 committed by GitHub
commit 51c466f7cf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/assignments/models.py
View File

@ -4,7 +4,7 @@ from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy, ugettext_noop
from django.utils.translation import ugettext_noop
from openslides.agenda.models import Item, Speaker
from openslides.core.config import config
@ -61,9 +61,9 @@ class Assignment(RESTModelMixin, models.Model):
PHASE_FINISHED = 2
PHASES = (
(PHASE_SEARCH, ugettext_lazy('Searching for candidates')),
(PHASE_VOTING, ugettext_lazy('Voting')),
(PHASE_FINISHED, ugettext_lazy('Finished')),
(PHASE_SEARCH, 'Searching for candidates'),
(PHASE_VOTING, 'Voting'),
(PHASE_FINISHED, 'Finished'),
)
title = models.CharField(

4
openslides/assignments/static/js/assignments/site.js
View File

@ -714,6 +714,10 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments'])
'projector view)');
gettext('Title for PDF document (all elections)');
gettext('Preamble text for PDF document (all elections)');
//other translations
gettext('Searching for candidates');
gettext('Voting');
gettext('Finished');
}
]);