From 19a76f5d3d5b1abe7c11bdbd6542903118df4e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Fri, 4 Nov 2016 12:02:16 +0100 Subject: [PATCH] Changed label and help text of assignment config for 100-%-base. --- openslides/assignments/config_variables.py | 9 +++++---- openslides/assignments/static/js/assignments/site.js | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/openslides/assignments/config_variables.py b/openslides/assignments/config_variables.py index a22566743..16831c49e 100644 --- a/openslides/assignments/config_variables.py +++ b/openslides/assignments/config_variables.py @@ -29,16 +29,17 @@ def get_config_variables(): name='assignments_poll_100_percent_base', default_value='YES_NO_ABSTAIN', input_type='choice', - label='The 100 % base of an election result consists of', + label='The 100-%-base of an election result consists of', choices=( {'value': 'YES_NO_ABSTAIN', 'display_name': 'Yes/No/Abstain per candidate'}, {'value': 'YES_NO', 'display_name': 'Yes/No per candidate'}, {'value': 'VALID', 'display_name': 'All valid ballots'}, {'value': 'CAST', 'display_name': 'All casted ballots'}, {'value': 'DISABLED', 'display_name': 'Disabled (no percents)'}), - help_text="For Yes/No/Abstain and Yes/No the 100 % base depends on the election method: If there are " + - "more candidates than open posts, the sum of all votes of all candidates is 100 %. Otherwise " + - "the sum of all votes per candidate is 100 %.", + help_text=('For Yes/No/Abstain per candidate and Yes/No per candidate the 100-%-base ' + 'depends on the election method: If there is only one option per candidate, ' + 'the sum of all votes of all candidates is 100 %. Otherwise for each ' + 'candidate the sum of all votes is 100 %.'), weight=420, group='Elections', subgroup='Ballot and ballot papers') diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index a69b09bd6..ba17087ca 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -822,10 +822,11 @@ angular.module('OpenSlidesApp.assignments.site', [ gettext('Always Yes/No per candidate'); gettext('Elections'); gettext('Ballot and ballot papers'); - gettext('The 100 % base of an election result consists of'); - gettext('For Yes/No/Abstain and Yes/No the 100 % base depends on the election method: If there are ' + - 'more candidates than open posts, the sum of all votes of all candidates is 100 %. Otherwise ' + - 'the sum of all votes per candidate is 100 %.'); + gettext('The 100-%-base of an election result consists of'); + gettext('For Yes/No/Abstain per candidate and Yes/No per candidate the 100-%-base ' + + 'depends on the election method: If there is only one option per candidate, ' + + 'the sum of all votes of all candidates is 100 %. Otherwise for each ' + + 'candidate the sum of all votes is 100 %.'); gettext('Yes/No/Abstain per candidate'); gettext('Yes/No per candidate'); gettext('All valid ballots');