From 6bae5cf87a8a744139810181d0f8a9c4d75102e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Thu, 30 Aug 2018 15:05:08 +0200 Subject: [PATCH 1/2] Fixed translation strings and permission check. Updated Changelog. --- CHANGELOG.rst | 16 +++++++++------- openslides/core/config_variables.py | 8 ++++---- openslides/core/static/js/core/site.js | 7 ++++--- .../motion-detail/view-modified-agreed.html | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4a39b771c..39f0f6ff2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,31 +6,33 @@ https://openslides.org/ Version 2.3 (unreleased) ======================== +`Release notes `_ · +`Milestone `_ Agenda: - New item type 'hidden'. New visibilty filter in agenda [#3790]. -Elections: - - Support to change decimal places for elections with a plugin [#3803] - Motions: - New feature to scroll the projector to a specific line [#3748]. - New possibility to sort submitters [#3647]. - New representation of amendments (paragraph based creation, new diff and list views for amendments) [#3637]. - New feature to customize workflows and states [#3772, #3785]. - - New config options to show logos on the right side in PDF [#3768]. - New table of contents with page numbers and categories in PDF [#3766]. - New teporal field "modified final version" where the final version can be edited [#3781]. + - New config options to show logos on the right side in PDF [#3768]. - New config to show amendments also in motions table [#3792]. - Support to change decimal places for polls with a plugin [#3803]. +Elections: + - Support to change decimal places for elections with a plugin [#3803] + Core: - - Python 3.4 is not supported anymore [#3777]. - - Support Python 3.7 [#3786]. - - Updated pdfMake to 0.1.37 [#3766]. - Updated Django to 2.1 [#3777, #3786]. + - Support for Python 3.7 [#3786]. + - Python 3.4 is not supported anymore [#3777]. + - Updated pdfMake to 0.1.37 [#3766]. - Changed behavior of collectstatic management command [#3804]. diff --git a/openslides/core/config_variables.py b/openslides/core/config_variables.py index f8c82969b..7d911939d 100644 --- a/openslides/core/config_variables.py +++ b/openslides/core/config_variables.py @@ -299,7 +299,7 @@ def get_config_variables(): yield ConfigVariable( name='logo_pdf_header_L', default_value={ - 'display_name': 'PDF header logo (Left)', + 'display_name': 'PDF header logo (left)', 'path': ''}, input_type='static', weight=310, @@ -309,7 +309,7 @@ def get_config_variables(): yield ConfigVariable( name='logo_pdf_header_R', default_value={ - 'display_name': 'PDF header logo (Right)', + 'display_name': 'PDF header logo (right)', 'path': ''}, input_type='static', weight=311, @@ -319,7 +319,7 @@ def get_config_variables(): yield ConfigVariable( name='logo_pdf_footer_L', default_value={ - 'display_name': 'PDF footer logo (Left)', + 'display_name': 'PDF footer logo (left)', 'path': ''}, input_type='static', weight=312, @@ -329,7 +329,7 @@ def get_config_variables(): yield ConfigVariable( name='logo_pdf_footer_R', default_value={ - 'display_name': 'PDF footer logo (Right)', + 'display_name': 'PDF footer logo (right)', 'path': ''}, input_type='static', weight=313, diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index e038a60bc..4059a376a 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -2119,9 +2119,10 @@ angular.module('OpenSlidesApp.core.site', [ gettext('List of speakers overlay'); gettext('Projector logo'); gettext('Projector header image'); - gettext('PDF header logo (Left)'); - gettext('PDF header logo (Right)'); - gettext('PDF footer logo'); + gettext('PDF header logo (left)'); + gettext('PDF header logo (right)'); + gettext('PDF footer logo (left)'); + gettext('PDF footer logo (right)'); gettext('Web interface header logo'); gettext('PDF ballot paper logo'); gettext('Custom translations'); diff --git a/openslides/motions/static/templates/motions/motion-detail/view-modified-agreed.html b/openslides/motions/static/templates/motions/motion-detail/view-modified-agreed.html index e55dbc472..69c0ed664 100644 --- a/openslides/motions/static/templates/motions/motion-detail/view-modified-agreed.html +++ b/openslides/motions/static/templates/motions/motion-detail/view-modified-agreed.html @@ -1,7 +1,7 @@
-