From 0f2667619b9b4364f5f53545312d6c6e4b1d599b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Krienb=C3=BChl?= Date: Thu, 23 Nov 2017 11:59:25 +0100 Subject: [PATCH 1/3] Change minimum Postgres requirement to 9.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0965a6d..dd695d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: env: TOXENV=pep8 addons: - postgresql: "9.3" + postgresql: "9.6" install: - pip install tox From 606bb43a9238b8a6c128ff97512e50d624759a80 Mon Sep 17 00:00:00 2001 From: Marc Sommerhalder Date: Mon, 27 Nov 2017 08:57:07 +0100 Subject: [PATCH 2/3] Updates translation --- HISTORY.rst | 4 ++++ onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po | 2 +- onegov/gazette/tests/test_views_notice.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a495193..9dc429c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,5 +1,9 @@ Changelog --------- + +- Updates translation. + [msom] + 1.9.6 (2017-11-20) ~~~~~~~~~~~~~~~~~~~ diff --git a/onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po b/onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po index 2923d32..7871e38 100644 --- a/onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po +++ b/onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po @@ -452,7 +452,7 @@ msgstr "" "werden." msgid "mail sent" -msgstr "E-Mail gesendet" +msgstr "Druck beauftragt" msgid "Submit" msgstr "Einreichen" diff --git a/onegov/gazette/tests/test_views_notice.py b/onegov/gazette/tests/test_views_notice.py index aa1adda..1731d04 100644 --- a/onegov/gazette/tests/test_views_notice.py +++ b/onegov/gazette/tests/test_views_notice.py @@ -581,7 +581,7 @@ def test_view_notice_changelog(gazette_app): ('01.11.2017 12:45', 'First Editor', 'TestGroup', 'bearbeitet'), ('01.11.2017 12:48', 'First Editor', 'TestGroup', 'eingereicht'), - ('01.11.2017 16:00', 'Publisher', '', 'E-Mail gesendet'), + ('01.11.2017 16:00', 'Publisher', '', 'Druck beauftragt'), ('01.11.2017 16:00', 'Publisher', '', 'angenommen'), ] From 7f8c9ffe877fd61468fb7328750af2f39c5d5c56 Mon Sep 17 00:00:00 2001 From: Marc Sommerhalder Date: Mon, 27 Nov 2017 09:05:28 +0100 Subject: [PATCH 3/3] Uses a bigger reject comment field --- HISTORY.rst | 3 +++ onegov/gazette/forms.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 9dc429c..6044d2f 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,9 @@ Changelog - Updates translation. [msom] +- Uses a bigger reject comment field. + [msom] + 1.9.6 (2017-11-20) ~~~~~~~~~~~~~~~~~~~ diff --git a/onegov/gazette/forms.py b/onegov/gazette/forms.py index afeffd9..2e73e03 100644 --- a/onegov/gazette/forms.py +++ b/onegov/gazette/forms.py @@ -14,6 +14,7 @@ from wtforms import HiddenField from wtforms import RadioField from wtforms import StringField +from wtforms import TextAreaField from wtforms.validators import Email from wtforms.validators import InputRequired @@ -185,9 +186,10 @@ def apply_model(self, model): class RejectForm(Form): - comment = StringField( + comment = TextAreaField( label=_("Comment"), validators=[ InputRequired() - ] + ], + render_kw={'rows': 4} )