From 2a72b9922e8e6b6e3e5c47a55dbc2c2669653ac9 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 16 Jan 2020 13:43:57 +0100 Subject: [PATCH 1/2] Update requirements Run (cd requirements; rm *.txt; make) --- requirements/base.txt | 14 +++++++------- requirements/dev.txt | 38 ++++++++++++++++++------------------- requirements/docs.txt | 10 +++++----- requirements/production.txt | 14 +++++++------- requirements/test.txt | 30 ++++++++++++++--------------- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 5fd259c..0d8976a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -9,10 +9,10 @@ beautifulsoup4==4.6.0 # via wagtail certifi==2019.11.28 # via requests chardet==3.0.4 # via requests django-auth-ldap==2.1.0 -django-modelcluster==5.0 # via wagtail -django-modeltranslation==0.14.1 # via wagtail-modeltranslation +django-modelcluster==5.0.1 # via wagtail +django-modeltranslation==0.14.2 # via wagtail-modeltranslation django-taggit==1.2.0 # via wagtail -django-treebeard==4.3 # via wagtail +django-treebeard==4.3.1 # via wagtail django==2.2.9 djangorestframework==3.11.0 # via wagtail draftjs-exporter==2.1.7 # via wagtail @@ -20,22 +20,22 @@ html5lib==1.0.1 # via wagtail ics==0.6 idna==2.8 # via requests markdown==3.1.1 -pillow==6.2.1 # via wagtail +pillow==6.2.2 # via wagtail psycopg2-binary==2.8.4 -pyasn1-modules==0.2.7 # via python-ldap +pyasn1-modules==0.2.8 # via python-ldap pyasn1==0.4.8 # via pyasn1-modules, python-ldap pygments==2.5.2 python-dateutil==2.8.1 # via arrow, ics python-ldap==3.2.0 # via django-auth-ldap pytz==2019.3 # via django, django-modelcluster, wagtail requests==2.22.0 # via wagtail -six==1.13.0 # via django-modeltranslation, html5lib, ics, python-dateutil, wagtail +six==1.14.0 # via django-modeltranslation, html5lib, ics, python-dateutil, wagtail sqlparse==0.3.0 # via django tatsu==4.4.0 # via ics unidecode==1.1.1 # via wagtail urllib3==1.25.7 # via requests wagtail-modeltranslation==0.10.6 -wagtail==2.7 +wagtail==2.7.1 webencodings==0.5.1 # via html5lib willow==1.3 # via wagtail diff --git a/requirements/dev.txt b/requirements/dev.txt index ca8cc0b..269ba27 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,77 +12,77 @@ beautifulsoup4==4.6.0 certifi==2019.11.28 chardet==3.0.4 click==7.0 # via pip-tools -coverage==5.0.1 +coverage==5.0.3 decorator==4.4.1 # via ipython, traitlets django-auth-ldap==2.1.0 django-coverage-plugin==1.6.0 django-debug-toolbar==2.1 -django-modelcluster==5.0 -django-modeltranslation==0.14.1 +django-modelcluster==5.0.1 +django-modeltranslation==0.14.2 django-taggit==1.2.0 -django-treebeard==4.3 +django-treebeard==4.3.1 django==2.2.9 djangorestframework==3.11.0 draftjs-exporter==2.1.7 entrypoints==0.3 factory-boy==2.12.0 -faker==3.0.0 # via factory-boy +faker==4.0.0 # via factory-boy flake8==3.7.9 html5lib==1.0.1 ics==0.6 idna==2.8 -importlib-metadata==1.3.0 +importlib-metadata==1.4.0 ipdb==0.12.3 ipython-genutils==0.2.0 # via traitlets -ipython==7.10.2 # via ipdb +ipython==7.11.1 # via ipdb isort==4.3.21 # via pylint jedi==0.15.2 # via ipython lazy-object-proxy==1.4.3 # via astroid markdown==3.1.1 mccabe==0.6.1 -more-itertools==8.0.2 -packaging==19.2 +more-itertools==8.1.0 +packaging==20.0 parso==0.5.2 # via jedi pexpect==4.7.0 # via ipython pickleshare==0.7.5 # via ipython -pillow==6.2.1 +pillow==6.2.2 pip-tools==4.3.0 pluggy==0.13.1 prompt-toolkit==3.0.2 # via ipython psycopg2-binary==2.8.4 ptyprocess==0.6.0 # via pexpect -py==1.8.0 -pyasn1-modules==0.2.7 +py==1.8.1 +pyasn1-modules==0.2.8 pyasn1==0.4.8 pycodestyle==2.5.0 -pydocstyle==5.0.1 # via pylama +pydocstyle==5.0.2 # via pylama pyflakes==2.1.1 pygments==2.5.2 pylama==7.7.1 pylint==2.4.4 pyparsing==2.4.6 -pytest-django==3.7.0 +pytest-django==3.8.0 pytest==5.3.2 python-dateutil==2.8.1 python-ldap==3.2.0 pytz==2019.3 requests==2.22.0 -six==1.13.0 +six==1.14.0 snowballstemmer==2.0.0 # via pydocstyle sqlparse==0.3.0 tatsu==4.4.0 text-unidecode==1.3 # via faker traitlets==4.3.3 # via ipython -typed-ast==1.4.0 # via astroid +typed-ast==1.4.1 # via astroid unidecode==1.1.1 urllib3==1.25.7 wagtail-modeltranslation==0.10.6 -wagtail==2.7 -wcwidth==0.1.7 +wagtail==2.7.1 +wcwidth==0.1.8 webencodings==0.5.1 willow==1.3 wrapt==1.11.2 # via astroid -zipp==0.6.0 +zipp==1.0.0 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/docs.txt b/requirements/docs.txt index 0ce10e2..23ee50b 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -5,22 +5,22 @@ # pip-compile --output-file=docs.txt docs.in # alabaster==0.7.12 # via sphinx -babel==2.7.0 # via sphinx +babel==2.8.0 # via sphinx certifi==2019.11.28 # via requests chardet==3.0.4 # via requests commonmark==0.9.1 # via recommonmark -docutils==0.15.2 # via recommonmark, sphinx +docutils==0.16 # via recommonmark, sphinx idna==2.8 # via requests -imagesize==1.1.0 # via sphinx +imagesize==1.2.0 # via sphinx jinja2==2.10.3 # via sphinx markupsafe==1.1.1 # via jinja2 -packaging==19.2 # via sphinx +packaging==20.0 # via sphinx pygments==2.5.2 # via sphinx pyparsing==2.4.6 # via packaging pytz==2019.3 # via babel recommonmark==0.6.0 requests==2.22.0 # via sphinx -six==1.13.0 # via packaging +six==1.14.0 # via packaging snowballstemmer==2.0.0 # via sphinx sphinx-rtd-theme==0.4.3 sphinx==2.3.1 diff --git a/requirements/production.txt b/requirements/production.txt index d1b0800..61e2110 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -9,10 +9,10 @@ beautifulsoup4==4.6.0 certifi==2019.11.28 chardet==3.0.4 django-auth-ldap==2.1.0 -django-modelcluster==5.0 -django-modeltranslation==0.14.1 +django-modelcluster==5.0.1 +django-modeltranslation==0.14.2 django-taggit==1.2.0 -django-treebeard==4.3 +django-treebeard==4.3.1 django==2.2.9 djangorestframework==3.11.0 draftjs-exporter==2.1.7 @@ -20,22 +20,22 @@ html5lib==1.0.1 ics==0.6 idna==2.8 markdown==3.1.1 -pillow==6.2.1 +pillow==6.2.2 psycopg2-binary==2.8.4 -pyasn1-modules==0.2.7 +pyasn1-modules==0.2.8 pyasn1==0.4.8 pygments==2.5.2 python-dateutil==2.8.1 python-ldap==3.2.0 pytz==2019.3 requests==2.22.0 -six==1.13.0 +six==1.14.0 sqlparse==0.3.0 tatsu==4.4.0 unidecode==1.1.1 urllib3==1.25.7 wagtail-modeltranslation==0.10.6 -wagtail==2.7 +wagtail==2.7.1 webencodings==0.5.1 willow==1.3 diff --git a/requirements/test.txt b/requirements/test.txt index 2668ed1..0741b4b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -9,13 +9,13 @@ attrs==19.3.0 # via pytest beautifulsoup4==4.6.0 certifi==2019.11.28 chardet==3.0.4 -coverage==5.0.1 +coverage==5.0.3 django-auth-ldap==2.1.0 django-coverage-plugin==1.6.0 -django-modelcluster==5.0 -django-modeltranslation==0.14.1 +django-modelcluster==5.0.1 +django-modeltranslation==0.14.2 django-taggit==1.2.0 -django-treebeard==4.3 +django-treebeard==4.3.1 django==2.2.9 djangorestframework==3.11.0 draftjs-exporter==2.1.7 @@ -24,38 +24,38 @@ flake8==3.7.9 html5lib==1.0.1 ics==0.6 idna==2.8 -importlib-metadata==1.3.0 # via pluggy, pytest +importlib-metadata==1.4.0 # via pluggy, pytest markdown==3.1.1 mccabe==0.6.1 # via flake8 -more-itertools==8.0.2 # via pytest, zipp -packaging==19.2 # via pytest -pillow==6.2.1 +more-itertools==8.1.0 # via pytest, zipp +packaging==20.0 # via pytest +pillow==6.2.2 pluggy==0.13.1 # via pytest psycopg2-binary==2.8.4 -py==1.8.0 # via pytest -pyasn1-modules==0.2.7 +py==1.8.1 # via pytest +pyasn1-modules==0.2.8 pyasn1==0.4.8 pycodestyle==2.5.0 # via flake8 pyflakes==2.1.1 # via flake8 pygments==2.5.2 pyparsing==2.4.6 # via packaging -pytest-django==3.7.0 +pytest-django==3.8.0 pytest==5.3.2 python-dateutil==2.8.1 python-ldap==3.2.0 pytz==2019.3 requests==2.22.0 -six==1.13.0 +six==1.14.0 sqlparse==0.3.0 tatsu==4.4.0 unidecode==1.1.1 urllib3==1.25.7 wagtail-modeltranslation==0.10.6 -wagtail==2.7 -wcwidth==0.1.7 # via pytest +wagtail==2.7.1 +wcwidth==0.1.8 # via pytest webencodings==0.5.1 willow==1.3 -zipp==0.6.0 # via importlib-metadata +zipp==1.0.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools From 1fdd43df24e77a34ff00b47ab1b809318b4a6135 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 16 Jan 2020 13:55:15 +0100 Subject: [PATCH 2/2] Update translations Run ./manage.py makemessages -l de --- locale/de/LC_MESSAGES/django.po | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 38f5645..54816bc 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-03 15:43+0100\n" +"POT-Creation-Date: 2020-01-16 13:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -366,7 +366,7 @@ msgid "Small integer" msgstr "" #: bla/lib/python3.7/site-packages/django/db/models/fields/__init__.py:2081 -#: mpicms/base/models.py:69 +#: mpicms/base/models.py:70 msgid "Text" msgstr "Text" @@ -1391,7 +1391,7 @@ msgstr "Tabelle" msgid "content" msgstr "Inhalt" -#: mpicms/base/blocks.py:38 mpicms/base/blocks.py:41 mpicms/base/models.py:68 +#: mpicms/base/blocks.py:38 mpicms/base/blocks.py:41 mpicms/base/models.py:69 #: mpicms/templates/personal/list.html:40 msgid "Title" msgstr "Titel" @@ -1420,64 +1420,64 @@ msgstr "Kontakte" msgid "Sidebar Content" msgstr "Inhalt der Seitenleiste" -#: mpicms/base/models.py:40 mpicms/personal/models.py:68 +#: mpicms/base/models.py:41 mpicms/personal/models.py:68 #: mpicms/personal/models.py:95 mpicms/publications/models.py:15 msgid "title" msgstr "Titel" -#: mpicms/base/models.py:41 +#: mpicms/base/models.py:42 msgid "text" msgstr "Text" -#: mpicms/base/models.py:53 mpicms/base/models.py:64 +#: mpicms/base/models.py:54 mpicms/base/models.py:65 msgid "featured image" msgstr "Titelbild" -#: mpicms/base/models.py:54 +#: mpicms/base/models.py:55 msgid "featured images" msgstr "Titelbilder" -#: mpicms/base/models.py:70 mpicms/base/models.py:71 +#: mpicms/base/models.py:71 mpicms/base/models.py:72 msgid "Banner" msgstr "Banner" -#: mpicms/base/models.py:74 +#: mpicms/base/models.py:75 msgid "Footer Items" msgstr "Footer Menüs" -#: mpicms/base/models.py:77 +#: mpicms/base/models.py:78 msgid "Quick Links" msgstr "Quick Links" -#: mpicms/base/models.py:90 +#: mpicms/base/models.py:91 msgid "root page" msgstr "Grundseite" -#: mpicms/base/models.py:91 +#: mpicms/base/models.py:92 msgid "root pages" msgstr "Grundseiten" -#: mpicms/base/models.py:107 +#: mpicms/base/models.py:108 msgid "homepage" msgstr "Startseite" -#: mpicms/base/models.py:108 +#: mpicms/base/models.py:109 msgid "homepages" msgstr "Startseiten" -#: mpicms/base/models.py:118 +#: mpicms/base/models.py:119 msgid "wiki page" msgstr "Wikiseite" -#: mpicms/base/models.py:119 +#: mpicms/base/models.py:120 msgid "wiki pages" msgstr "Wikiseiten" -#: mpicms/base/models.py:126 +#: mpicms/base/models.py:130 msgid "Phonelist" msgstr "Telefonliste" -#: mpicms/base/models.py:127 +#: mpicms/base/models.py:131 msgid "Phonelists" msgstr "Telefonlisten"