Merge branch 'master' into v1.10

OneGov · Nov 27, 2017 · 5f8f76f · 5f8f76f
2 parents 32452cf + 04ad6d9
commit 5f8f76f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git 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

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,12 @@
 Changelog
 ---------
 
+- Updates translation.
+  [msom]
+
+- Uses a bigger reject comment field.
+  [msom]
+
 - Adds missing title slot.
   [msom]
 

diff --git a/onegov/gazette/forms/common.py b/onegov/gazette/forms/common.py
@@ -1,6 +1,6 @@
 from onegov.form import Form
 from onegov.gazette import _
-from wtforms import StringField
+from wtforms import TextAreaField
 from wtforms.validators import InputRequired
 
 
@@ -11,9 +11,10 @@ class EmptyForm(Form):
 
 class RejectForm(Form):
 
-    comment = StringField(
+    comment = TextAreaField(
         label=_("Comment"),
         validators=[
             InputRequired()
-        ]
+        ],
+        render_kw={'rows': 4}
     )
diff --git a/onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po b/onegov/gazette/locale/de_CH/LC_MESSAGES/onegov.gazette.po
@@ -560,7 +560,7 @@ msgid "This official notice has already been published!"
 msgstr "Diese Meldung wurde bereits veröffentlicht!"
 
 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
@@ -670,7 +670,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'),
     ]