From 714e1f3809a667d2ae2dca6ae7d557073f9e56c3 Mon Sep 17 00:00:00 2001 From: erion Date: Wed, 3 Mar 2021 12:11:28 +0100 Subject: [PATCH 1/3] Reduce Dockerfile size and the number of RUN steps. --- Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99d2671ce..0f10015c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,12 @@ FROM python:3.9 ENV PYTHONUNBUFFERED 1 -RUN mkdir /app -RUN mkdir /app/static -RUN mkdir /app/images +RUN mkdir /app /app/static /app/images WORKDIR /app COPY requirements.txt /app/ -RUN pip install -r requirements.txt -RUN apt-get update && apt-get install -y gettext libgettextpo-dev +RUN pip install -r requirements.txt --no-cache-dir +RUN apt-get update && apt-get install -y gettext libgettextpo-dev && apt-get clean -COPY ./bookwyrm /app -COPY ./celerywyrm /app +COPY ./bookwyrm ./celerywyrm /app/ From 7151aeedd632fd4b9fc063262ba536c7fbc50ef7 Mon Sep 17 00:00:00 2001 From: tofuwabohu Date: Wed, 3 Mar 2021 22:54:22 +0100 Subject: [PATCH 2/3] New strings and some fixes --- locale/de_DE/LC_MESSAGES/django.po | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index e45532117..a8bd57881 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -20,24 +20,24 @@ msgstr "" #: bookwyrm/forms.py:185 msgid "One Day" -msgstr "" +msgstr "Ein Tag" #: bookwyrm/forms.py:186 msgid "One Week" -msgstr "" +msgstr "Eine Woche" #: bookwyrm/forms.py:187 msgid "One Month" -msgstr "" +msgstr "Ein Monat" #: bookwyrm/forms.py:188 msgid "Does Not Expire" -msgstr "" +msgstr "Läuft nicht aus" #: bookwyrm/forms.py:190 #, python-format msgid "%(count)d uses" -msgstr "" +msgstr "%(count)d Benutzungen" #: bookwyrm/forms.py:192 #, fuzzy @@ -48,12 +48,12 @@ msgstr "Ungelistet" #: bookwyrm/models/fields.py:24 #, python-format msgid "%(value)s is not a valid remote_id" -msgstr "" +msgstr "%(value)s ist keine gültige remote_id" #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42 #, python-format msgid "%(value)s is not a valid username" -msgstr "" +msgstr "%(value)s ist kein gültiger Username" #: bookwyrm/models/fields.py:164 #, fuzzy @@ -63,23 +63,23 @@ msgstr "Servername" #: bookwyrm/models/fields.py:169 msgid "A user with that username already exists." -msgstr "" +msgstr "Dieser Benutzename ist bereits vergeben." #: bookwyrm/settings.py:142 msgid "English" -msgstr "" +msgstr "Englisch" #: bookwyrm/settings.py:143 msgid "German" -msgstr "" +msgstr "Deutsch" #: bookwyrm/settings.py:144 msgid "French" -msgstr "" +msgstr "Französisch" #: bookwyrm/settings.py:145 msgid "Simplified Chinese" -msgstr "" +msgstr "Vereinfachtes Chinesisch" #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17 #: bookwyrm/templates/edit_author.html:5 @@ -97,7 +97,7 @@ msgstr "Bücher von %(name)s" #: bookwyrm/templates/book.html:21 msgid "by" -msgstr "" +msgstr "von" #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30 #: bookwyrm/templates/edit_book.html:5 @@ -144,8 +144,8 @@ msgstr "In OpenLibrary ansehen" #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(%(review_count)s Bewertung)" +msgstr[1] "(%(review_count)s Bewertungen)" #: bookwyrm/templates/book.html:106 msgid "Add Description" @@ -257,7 +257,7 @@ msgstr "" #: bookwyrm/templates/discover/about.html:13 #: bookwyrm/templates/discover/about.html:29 msgid "Privacy Policy" -msgstr "" +msgstr "Datenschutzerklärung" #: bookwyrm/templates/discover/discover.html:6 msgid "Recent Books" @@ -482,20 +482,20 @@ msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszul #, fuzzy #| msgid "Read" msgid "To Read" -msgstr "Lesen" +msgstr "Auf der Leseliste" #: bookwyrm/templates/feed/feed_layout.html:24 #: bookwyrm/templates/user/shelf.html:24 #, fuzzy #| msgid "Start reading" msgid "Currently Reading" -msgstr "Zu lesen beginnen" +msgstr "Gerade lesend" #: bookwyrm/templates/feed/feed_layout.html:25 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 #: bookwyrm/templates/user/shelf.html:24 msgid "Read" -msgstr "Lesen" +msgstr "Gelesen" #: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26 #: bookwyrm/templates/snippets/goal_card.html:6 @@ -1268,7 +1268,7 @@ msgstr "" #: bookwyrm/templates/snippets/book_titleby.html:3 #, python-format msgid "%(title)s by " -msgstr "%(title)s von" +msgstr "%(title)s von " #: bookwyrm/templates/snippets/boost_button.html:8 #: bookwyrm/templates/snippets/boost_button.html:9 @@ -1312,7 +1312,7 @@ msgstr "" #: bookwyrm/templates/snippets/rate_action.html:14 #: bookwyrm/templates/snippets/stars.html:3 msgid "No rating" -msgstr "" +msgstr "Kein Rating" #: bookwyrm/templates/snippets/create_status_form.html:54 msgid "Include spoiler alert" @@ -1327,7 +1327,7 @@ msgstr "Privat" #: bookwyrm/templates/snippets/create_status_form.html:67 msgid "Post" -msgstr "" +msgstr "Absenden" #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4 msgid "Delete these read dates?" From 8946f89565e1617cefdd0fd602a9051120502abe Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Mar 2021 15:17:22 -0800 Subject: [PATCH 3/3] Compiles german locale --- locale/de_DE/LC_MESSAGES/django.mo | Bin 23092 -> 24083 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index ebd743358d676536065661036acf2b1a4aff20f9..1be5cbcb284088a18da6e09eb8b6c090471d7194 100644 GIT binary patch delta 8137 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 delta 7207 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