From 256a8d920316e11af3f1330a9ae1c747c8eb02e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Fri, 23 Sep 2016 15:41:50 +0200 Subject: [PATCH] Small style changes. --- openslides/assignments/config_variables.py | 2 +- openslides/assignments/static/js/assignments/site.js | 6 +++--- openslides/motions/static/js/motions/site.js | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/openslides/assignments/config_variables.py b/openslides/assignments/config_variables.py index 06f52a6d8..a22566743 100644 --- a/openslides/assignments/config_variables.py +++ b/openslides/assignments/config_variables.py @@ -37,7 +37,7 @@ def get_config_variables(): {'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 " + + "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 %.", weight=420, group='Elections', diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index 53ac5f4bd..c99a0a28f 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -765,9 +765,9 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments']) 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 %.'); + 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('Yes/No/Abstain per candidate'); gettext('Yes/No per candidate'); gettext('All valid ballots'); diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 65764c88b..baaa136f4 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1867,7 +1867,6 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid gettext('All valid ballots'); gettext('All casted ballots'); gettext('Disabled (no percents)'); - gettext('Yes and No votes'); gettext('Number of ballot papers (selection)'); gettext('Number of all delegates'); gettext('Number of all participants');