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

Merge pull request #1741 from emanuelschuetze/translations

Browse Source 
Updated English translation strings.
This commit is contained in:
Norman Jäckel 2015-12-07 15:36:18 +01:00
commit d368bedfc9
13 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/models.py
View File

@ -300,7 +300,7 @@ class SpeakerManager(models.Manager):
""" """
if self.filter(user=user, item=item, begin_time=None).exists(): if self.filter(user=user, item=item, begin_time=None).exists():
raise OpenSlidesError( raise OpenSlidesError(
_('%(user)s is already on the list of speakers of item %(id)s.') _('%(user)s is already on the list of speakers of %(id)s.')
% {'user': user, 'id': item.id}) % {'user': user, 'id': item.id})
if isinstance(user, AnonymousUser): if isinstance(user, AnonymousUser):
raise OpenSlidesError( raise OpenSlidesError(

6
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -76,7 +76,7 @@
<div class="col-sm-12 text-right"> <div class="col-sm-12 text-right">
<!-- hidden item filter --> <!-- hidden item filter -->
<input type="checkbox" ng-model="filter.noHiddenItems" ng-true-value="1" ng-false-value=""> <input type="checkbox" ng-model="filter.noHiddenItems" ng-true-value="1" ng-false-value="">
<translate> Hide internal agenda items</translate> <translate> Hide internal items</translate>
<!-- closed filter --> <!-- closed filter -->
<input type="checkbox" ng-model="filter.noClosedItems" ng-true-value="false" ng-false-value=""> <input type="checkbox" ng-model="filter.noClosedItems" ng-true-value="false" ng-false-value="">
<translate> Hide closed items</translate> <translate> Hide closed items</translate>
@ -132,7 +132,7 @@
<input type="checkbox" ng-model="item.selected"> <input type="checkbox" ng-model="item.selected">
<!-- agenda data columns --> <!-- agenda data columns -->
<td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"> <td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false">
<span ng-if="item.type == 2" title="'Hidden agenda item'|translate"><i class="fa fa-ban"></i></span> <span ng-if="item.type == 2" title="'Hidden item'|translate"><i class="fa fa-ban"></i></span>
<strong> <strong>
<a href="" ng-click="open(item)"> <a href="" ng-click="open(item)">
<span ng-repeat="n in [].constructor(item.parentCount) track by $index">&ndash;</span> <span ng-repeat="n in [].constructor(item.parentCount) track by $index">&ndash;</span>
@ -190,7 +190,7 @@
<label> <label>
<!-- item type: AGENDA_ITEM = 1, HIDDEN_ITEM = 2 --> <!-- item type: AGENDA_ITEM = 1, HIDDEN_ITEM = 2 -->
<input type="checkbox" ng-model="item.type" ng-true-value="2" ng-false-value="1"> <input type="checkbox" ng-model="item.type" ng-true-value="2" ng-false-value="1">
<translate> Hidden agenda item</translate> <translate> Hidden item</translate>
</label> </label>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">

4
openslides/assignments/models.py
View File

@ -359,9 +359,9 @@ class AssignmentPoll(RESTModelMixin, CollectDefaultVotesMixin,
def get_vote_values(self): def get_vote_values(self):
if self.yesnoabstain: if self.yesnoabstain:
return [ugettext_noop('Yes'), ugettext_noop('No'), ugettext_noop('Abstain')] return ['Yes', 'No', 'Abstain']
else: else:
return [ugettext_noop('Votes')] return ['Votes']
def get_ballot(self): def get_ballot(self):
return self.assignment.polls.filter(id__lte=self.pk).count() return self.assignment.polls.filter(id__lte=self.pk).count()

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

@ -346,6 +346,9 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments'])
$scope.alert = { type: 'danger', msg: data.detail, show: true }; $scope.alert = { type: 'danger', msg: data.detail, show: true };
}); });
}; };
// Just mark some vote value strings for translation.
gettext('Yes'), gettext('No'), gettext('Abstain');
} }
]) ])

16
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -114,14 +114,18 @@
</div> </div>
<div class="results"> <div class="results">
<div ng-repeat="option in poll.options"> <div ng-repeat="option in poll.options">
<strong>{{ option.candidate.get_full_name() }}</strong> <div ng-if="poll.yesnoabstain && option.votes.length > 0">
<div ng-if="option.votes.length > 0"> <strong>{{ option.candidate.get_full_name() }}</strong><br>
<div ng-repeat="vote in option.votes"> {{ option.votes[0].value | translate }}: {{ option.votes[0].weight }}<br>
{{ vote.value}}: {{ vote.weight}} {{ option.votes[1].value | translate }}: {{ option.votes[1].weight }}<br>
</div> {{ option.votes[2].value | translate }}: {{ option.votes[2].weight }}
<hr class="smallhr">
</div>
<div ng-if="!poll.yesnoabstain && option.votes.length > 0">
{{ option.candidate.get_full_name() }}: {{ option.votes[0].weight}}
<hr class="smallhr">
</div> </div>
</div> </div>
<hr>
Valid votes: {{ poll.votesvalid }}<br> Valid votes: {{ poll.votesvalid }}<br>
Invalid votes: {{ poll.votesinvalid }}<br> Invalid votes: {{ poll.votesinvalid }}<br>
Votes cast: {{ poll.votescast }} Votes cast: {{ poll.votescast }}

6
openslides/assignments/views.py
View File

@ -215,10 +215,10 @@ class AssignmentViewSet(ModelViewSet):
""" """
assignment = self.get_object() assignment = self.get_object()
if not assignment.candidates.exists(): if not assignment.candidates.exists():
raise ValidationError({'detail': _('Can not create poll because there are no candidates.')}) raise ValidationError({'detail': _('Can not create ballot because there are no candidates.')})
with transaction.atomic(): with transaction.atomic():
assignment.create_poll() assignment.create_poll()
return Response({'detail': _('Poll created successfully.')}) return Response({'detail': _('Ballot created successfully.')})
class AssignmentPollViewSet(UpdateModelMixin, DestroyModelMixin, GenericViewSet): class AssignmentPollViewSet(UpdateModelMixin, DestroyModelMixin, GenericViewSet):
@ -522,7 +522,7 @@ class AssignmentPollPDF(PDFView):
{'circle': circle, {'circle': circle,
'yes': _("Yes"), 'yes': _("Yes"),
'no': _("No"), 'no': _("No"),
'abstain': _("Abstention")}, 'abstain': _("Abstain")},
stylesheet['Ballot_option_circle_YNA'])) stylesheet['Ballot_option_circle_YNA']))
if counter == 13: if counter == 13:
cellcolumnA = cell cellcolumnA = cell

29
openslides/locale/angular-gettext/template-en.pot
View File

@ -26,7 +26,8 @@ msgstr ""
msgid "About me" msgid "About me"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:437 #: assignments/static/js/assignments/site.js:351
#: assignments/static/js/assignments/site.js:440
#: motions/static/templates/motions/motion-detail.html:135 #: motions/static/templates/motions/motion-detail.html:135
#: motions/static/templates/motions/motion-detail.html:136 #: motions/static/templates/motions/motion-detail.html:136
#: motions/static/templates/motions/motion-detail.html:186 #: motions/static/templates/motions/motion-detail.html:186
@ -191,7 +192,7 @@ msgid "Comment"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:120 #: assignments/static/js/assignments/site.js:120
#: assignments/static/js/assignments/site.js:487 #: assignments/static/js/assignments/site.js:490
msgid "Comment on the ballot paper" msgid "Comment on the ballot paper"
msgstr "" msgstr ""
@ -450,7 +451,7 @@ msgstr ""
#: agenda/static/templates/agenda/item-list.html:135 #: agenda/static/templates/agenda/item-list.html:135
#: agenda/static/templates/agenda/item-list.html:193 #: agenda/static/templates/agenda/item-list.html:193
msgid "Hidden agenda item" msgid "Hidden item"
msgstr "" msgstr ""
#: agenda/static/templates/agenda/item-list.html:82 #: agenda/static/templates/agenda/item-list.html:82
@ -458,7 +459,7 @@ msgid "Hide closed items"
msgstr "" msgstr ""
#: agenda/static/templates/agenda/item-list.html:79 #: agenda/static/templates/agenda/item-list.html:79
msgid "Hide internal agenda items" msgid "Hide internal items"
msgstr "" msgstr ""
#: core/static/js/core/site.js:86 #: core/static/js/core/site.js:86
@ -654,19 +655,20 @@ msgstr ""
msgid "New password" msgid "New password"
msgstr "" msgstr ""
#: motions/static/templates/motions/motion-detail.html:222
msgid "New poll"
msgstr ""
#: core/static/templates/core/tag-form.html:10 #: core/static/templates/core/tag-form.html:10
msgid "New tag" msgid "New tag"
msgstr "" msgstr ""
#: motions/static/templates/motions/motion-detail.html:222
msgid "New vote"
msgstr ""
#: agenda/static/templates/agenda/item-detail.html:67 #: agenda/static/templates/agenda/item-detail.html:67
msgid "Next speakers:" msgid "Next speakers:"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:428 #: assignments/static/js/assignments/site.js:351
#: assignments/static/js/assignments/site.js:431
#: motions/static/templates/motions/motion-detail.html:130 #: motions/static/templates/motions/motion-detail.html:130
#: motions/static/templates/motions/motion-detail.html:131 #: motions/static/templates/motions/motion-detail.html:131
#: motions/static/templates/motions/motion-detail.html:177 #: motions/static/templates/motions/motion-detail.html:177
@ -1137,18 +1139,18 @@ msgstr ""
msgid "Vote" msgid "Vote"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:477 #: assignments/static/js/assignments/site.js:480
#: motions/static/templates/motions/motion-detail.html:150 #: motions/static/templates/motions/motion-detail.html:150
#: motions/static/templates/motions/motion-detail.html:151 #: motions/static/templates/motions/motion-detail.html:151
#: motions/static/templates/motions/motion-detail.html:214 #: motions/static/templates/motions/motion-detail.html:214
msgid "Votes cast" msgid "Votes cast"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:469 #: assignments/static/js/assignments/site.js:472
msgid "Votes invalid" msgid "Votes invalid"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:461 #: assignments/static/js/assignments/site.js:464
msgid "Votes valid" msgid "Votes valid"
msgstr "" msgstr ""
@ -1161,7 +1163,8 @@ msgid "Workflow"
msgstr "" msgstr ""
#: assignments/static/js/assignments/site.js:127 #: assignments/static/js/assignments/site.js:127
#: assignments/static/js/assignments/site.js:419 #: assignments/static/js/assignments/site.js:351
#: assignments/static/js/assignments/site.js:422
#: motions/static/templates/motions/motion-detail.html:125 #: motions/static/templates/motions/motion-detail.html:125
#: motions/static/templates/motions/motion-detail.html:126 #: motions/static/templates/motions/motion-detail.html:126
#: motions/static/templates/motions/motion-detail.html:168 #: motions/static/templates/motions/motion-detail.html:168

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

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-30 20:59+0100\n" "POT-Creation-Date: 2015-12-07 13:31+0100\n"
"Language: en\n" "Language: en\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -228,24 +228,6 @@ msgstr ""
msgid "Comment on the ballot paper" msgid "Comment on the ballot paper"
msgstr "" msgstr ""
#: assignments/models.py:362 assignments/views.py:523 motions/models.py:691
#: motions/pdf.py:125 motions/pdf.py:270
msgid "Yes"
msgstr ""
#: assignments/models.py:362 assignments/views.py:524 motions/models.py:691
#: motions/pdf.py:125 motions/pdf.py:272
msgid "No"
msgstr ""
#: assignments/models.py:362 motions/models.py:691
msgid "Abstain"
msgstr ""
#: assignments/models.py:364
msgid "Votes"
msgstr ""
#: assignments/serializers.py:119 #: assignments/serializers.py:119
#, python-format #, python-format
msgid "You have to submit data for %d candidates." msgid "You have to submit data for %d candidates."
@ -437,11 +419,11 @@ msgid "User %s was successfully unelected."
msgstr "" msgstr ""
#: assignments/views.py:218 #: assignments/views.py:218
msgid "Can not create poll because there are no candidates." msgid "Can not create ballot because there are no candidates."
msgstr "" msgstr ""
#: assignments/views.py:221 motions/views.py:252 #: assignments/views.py:221
msgid "Poll created successfully." msgid "Ballot created successfully."
msgstr "" msgstr ""
#: assignments/views.py:275 #: assignments/views.py:275
@ -504,8 +486,16 @@ msgid_plural "%d available posts"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: assignments/views.py:523 motions/pdf.py:125 motions/pdf.py:270
msgid "Yes"
msgstr ""
#: assignments/views.py:524 motions/pdf.py:125 motions/pdf.py:272
msgid "No"
msgstr ""
#: assignments/views.py:525 motions/pdf.py:125 motions/pdf.py:274 #: assignments/views.py:525 motions/pdf.py:125 motions/pdf.py:274
msgid "Abstention" msgid "Abstain"
msgstr "" msgstr ""
#: core/config.py:28 core/config.py:59 #: core/config.py:28 core/config.py:59
@ -803,7 +793,7 @@ msgstr ""
msgid "Vote result" msgid "Vote result"
msgstr "" msgstr ""
#: motions/pdf.py:121 #: motions/pdf.py:121 motions/views.py:351
msgid "Vote" msgid "Vote"
msgstr "" msgstr ""
@ -1097,8 +1087,8 @@ msgstr ""
msgid "State set to" msgid "State set to"
msgstr "" msgstr ""
#: motions/views.py:351 #: motions/views.py:252
msgid "Poll" msgid "Vote created successfully."
msgstr "" msgstr ""
#: poll/models.py:71 #: poll/models.py:71
@ -1113,10 +1103,6 @@ msgstr ""
msgid "Disabled (no percents)" msgid "Disabled (no percents)"
msgstr "" msgstr ""
#: poll/models.py:152
msgid "votes"
msgstr ""
#: users/models.py:99 users/pdf.py:114 #: users/models.py:99 users/pdf.py:114
msgid "Username" msgid "Username"
msgstr "" msgstr ""

3
openslides/motions/models.py
View File

@ -687,8 +687,7 @@ class MotionPoll(RESTModelMixin, CollectDefaultVotesMixin, BasePoll):
option_class = MotionOption option_class = MotionOption
"""The option class, witch links between this object the the votes.""" """The option class, witch links between this object the the votes."""
vote_values = [ vote_values = ['Yes', 'No', 'Abstain']
ugettext_noop('Yes'), ugettext_noop('No'), ugettext_noop('Abstain')]
"""The possible anwers for the poll. 'Yes, 'No' and 'Abstain'.""" """The possible anwers for the poll. 'Yes, 'No' and 'Abstain'."""
def __str__(self): def __str__(self):

4
openslides/motions/pdf.py
View File

@ -122,7 +122,7 @@ def motion_to_pdf(pdf, motion):
stylesheet['Bold'])) stylesheet['Bold']))
cell6b.append(Paragraph( cell6b.append(Paragraph(
"%s: %s <br/> %s: %s <br/> %s: %s <br/> %s %s %s" % "%s: %s <br/> %s: %s <br/> %s: %s <br/> %s %s %s" %
(_("Yes"), yes, _("No"), no, _("Abstention"), abstain, valid, invalid, votescast), (_("Yes"), yes, _("No"), no, _("Abstain"), abstain, valid, invalid, votescast),
stylesheet['Normal'])) stylesheet['Normal']))
cell6b.append(Spacer(0, 0.2 * cm)) cell6b.append(Spacer(0, 0.2 * cm))
motion_data.append([cell6a, cell6b]) motion_data.append([cell6a, cell6b])
@ -271,7 +271,7 @@ def motion_poll_to_pdf(pdf, poll):
cell.append(Paragraph("<font name='circlefont' size='15'>%s</font> <font name='Ubuntu'>%s</font>" cell.append(Paragraph("<font name='circlefont' size='15'>%s</font> <font name='Ubuntu'>%s</font>"
% (circle, _("No")), stylesheet['Ballot_option'])) % (circle, _("No")), stylesheet['Ballot_option']))
cell.append(Paragraph("<font name='circlefont' size='15'>%s</font> <font name='Ubuntu'>%s</font>" cell.append(Paragraph("<font name='circlefont' size='15'>%s</font> <font name='Ubuntu'>%s</font>"
% (circle, _("Abstention")), stylesheet['Ballot_option'])) % (circle, _("Abstain")), stylesheet['Ballot_option']))
data = [] data = []
# get ballot papers config values # get ballot papers config values
ballot_papers_selection = config["motions_pdf_ballot_papers_selection"] ballot_papers_selection = config["motions_pdf_ballot_papers_selection"]

2
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -219,7 +219,7 @@
</ol> </ol>
<button ng-if="motion.isAllowed('create_poll')" ng-click="create_poll()" class="btn btn-default btn-sm"> <button ng-if="motion.isAllowed('create_poll')" ng-click="create_poll()" class="btn btn-default btn-sm">
<i class="fa fa-bar-chart fa-lg"></i> <i class="fa fa-bar-chart fa-lg"></i>
<translate>New poll</translate> <translate>New vote</translate>
</button> </button>
</div> </div>
<div class="col-sm-1"></div> <div class="col-sm-1"></div>

4
openslides/motions/views.py
View File

@ -249,7 +249,7 @@ class MotionViewSet(ModelViewSet):
motion.create_poll() motion.create_poll()
except WorkflowError as e: except WorkflowError as e:
raise ValidationError({'detail': e}) raise ValidationError({'detail': e})
return Response({'detail': _('Poll created successfully.')}) return Response({'detail': _('Vote created successfully.')})
class MotionPollViewSet(UpdateModelMixin, DestroyModelMixin, GenericViewSet): class MotionPollViewSet(UpdateModelMixin, DestroyModelMixin, GenericViewSet):
@ -348,7 +348,7 @@ class PollPDFView(PDFView):
""" """
Return the filename for the PDF. Return the filename for the PDF.
""" """
return u'%s%s_%s' % (_("Motion"), str(self.get_object().poll_number), _("Poll")) return u'%s%s_%s' % (_("Motion"), str(self.get_object().poll_number), _("Vote"))
def get_template(self, buffer): def get_template(self, buffer):
return SimpleDocTemplate( return SimpleDocTemplate(

4
openslides/poll/models.py
View File

@ -3,7 +3,7 @@ import locale
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.db import models from django.db import models
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy, ugettext_noop from django.utils.translation import ugettext_lazy
from openslides.utils.models import MinMaxIntegerField from openslides.utils.models import MinMaxIntegerField
@ -149,7 +149,7 @@ class BasePoll(models.Model):
""" """
Base poll class. Base poll class.
""" """
vote_values = [ugettext_noop('votes')] vote_values = ['Votes']
class Meta: class Meta:
abstract = True abstract = True