From c1903848f29d49d4ed4c757c0a04781f368b1004 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Fri, 4 Jan 2013 11:49:43 +0100 Subject: [PATCH 1/2] Update openslides/__init__.py --- openslides/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/__init__.py b/openslides/__init__.py index 7cd9d7464..dcf78b46d 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -5,7 +5,7 @@ :license: GNU GPL, see LICENSE for more details. """ -VERSION = (1, 4, 0, 'alpha', 0) # During development it is the next release +VERSION = (1, 4, 0, 'alpha', 1) # During development it is the next release RELEASE = False From d842214e261f5b9d24c0cbc3bcb0f660140202cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Fri, 4 Jan 2013 19:14:56 +0100 Subject: [PATCH 2/2] Fix typo in template. --- openslides/motion/templates/motion/view.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html index 3d2ad91b1..18d61fa3d 100644 --- a/openslides/motion/templates/motion/view.html +++ b/openslides/motion/templates/motion/view.html @@ -180,13 +180,13 @@ {% trans 'Adjourned' %}
{% endif %} {% if "noc" in actions %} - {% trans 'Not Concerned' %}
+ {% trans 'Not Concerned' %}
{% endif %} {% if "com" in actions %} - {% trans 'Commited a bill' %}
+ {% trans 'Commited a bill' %}
{% endif %} {% if "wit" in actions %} - {% trans 'Withdrawed by submitter' %} + {% trans 'Withdrawed by submitter' %} {% endif %} {% endif %}