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

Merge pull request #2589 from normanjaeckel/ConfigLabelHelpText

Browse Source 
Changed label and help text of assignment config for 100-%-base.
This commit is contained in:
Emanuel Schütze 2016-11-04 15:45:19 +01:00 committed by GitHub
commit 3225cdd1a9
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/assignments/config_variables.py
View File

@ -29,16 +29,17 @@ def get_config_variables():
name='assignments_poll_100_percent_base', name='assignments_poll_100_percent_base',
default_value='YES_NO_ABSTAIN', default_value='YES_NO_ABSTAIN',
input_type='choice', input_type='choice',
label='The 100 % base of an election result consists of', label='The 100-%-base of an election result consists of',
choices=( choices=(
{'value': 'YES_NO_ABSTAIN', 'display_name': 'Yes/No/Abstain per candidate'}, {'value': 'YES_NO_ABSTAIN', 'display_name': 'Yes/No/Abstain per candidate'},
{'value': 'YES_NO', 'display_name': 'Yes/No per candidate'}, {'value': 'YES_NO', 'display_name': 'Yes/No per candidate'},
{'value': 'VALID', 'display_name': 'All valid ballots'}, {'value': 'VALID', 'display_name': 'All valid ballots'},
{'value': 'CAST', 'display_name': 'All casted ballots'}, {'value': 'CAST', 'display_name': 'All casted ballots'},
{'value': 'DISABLED', 'display_name': 'Disabled (no percents)'}), {'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 " + help_text=('For Yes/No/Abstain per candidate and Yes/No per candidate the 100-%-base '
"more candidates than open posts, the sum of all votes of all candidates is 100 %. Otherwise " + 'depends on the election method: If there is only one option per candidate, '
"the sum of all votes per candidate is 100 %.", 'the sum of all votes of all candidates is 100 %. Otherwise for each '
'candidate the sum of all votes is 100 %.'),
weight=420, weight=420,
group='Elections', group='Elections',
subgroup='Ballot and ballot papers') subgroup='Ballot and ballot papers')

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

@ -822,10 +822,11 @@ angular.module('OpenSlidesApp.assignments.site', [
gettext('Always Yes/No per candidate'); gettext('Always Yes/No per candidate');
gettext('Elections'); gettext('Elections');
gettext('Ballot and ballot papers'); gettext('Ballot and ballot papers');
gettext('The 100 % base of an election result consists of'); 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 ' + gettext('For Yes/No/Abstain per candidate and Yes/No per candidate the 100-%-base ' +
'more candidates than open posts, the sum of all votes of all candidates is 100 %. Otherwise ' + 'depends on the election method: If there is only one option per candidate, ' +
'the sum of all votes per candidate is 100 %.'); '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/Abstain per candidate');
gettext('Yes/No per candidate'); gettext('Yes/No per candidate');
gettext('All valid ballots'); gettext('All valid ballots');