Merge branch 'main' into production

This commit is contained in:
Mouse Reeve 2021-03-03 15:17:47 -08:00
commit 8ac2315cc6
3 changed files with 26 additions and 29 deletions

View file

@ -2,15 +2,12 @@ FROM python:3.9
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
RUN mkdir /app RUN mkdir /app /app/static /app/images
RUN mkdir /app/static
RUN mkdir /app/images
WORKDIR /app WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install -r requirements.txt RUN pip install -r requirements.txt --no-cache-dir
RUN apt-get update && apt-get install -y gettext libgettextpo-dev RUN apt-get update && apt-get install -y gettext libgettextpo-dev && apt-get clean
COPY ./bookwyrm /app COPY ./bookwyrm ./celerywyrm /app/
COPY ./celerywyrm /app

Binary file not shown.

View file

@ -20,24 +20,24 @@ msgstr ""
#: bookwyrm/forms.py:185 #: bookwyrm/forms.py:185
msgid "One Day" msgid "One Day"
msgstr "" msgstr "Ein Tag"
#: bookwyrm/forms.py:186 #: bookwyrm/forms.py:186
msgid "One Week" msgid "One Week"
msgstr "" msgstr "Eine Woche"
#: bookwyrm/forms.py:187 #: bookwyrm/forms.py:187
msgid "One Month" msgid "One Month"
msgstr "" msgstr "Ein Monat"
#: bookwyrm/forms.py:188 #: bookwyrm/forms.py:188
msgid "Does Not Expire" msgid "Does Not Expire"
msgstr "" msgstr "Läuft nicht aus"
#: bookwyrm/forms.py:190 #: bookwyrm/forms.py:190
#, python-format #, python-format
msgid "%(count)d uses" msgid "%(count)d uses"
msgstr "" msgstr "%(count)d Benutzungen"
#: bookwyrm/forms.py:192 #: bookwyrm/forms.py:192
#, fuzzy #, fuzzy
@ -48,12 +48,12 @@ msgstr "Ungelistet"
#: bookwyrm/models/fields.py:24 #: bookwyrm/models/fields.py:24
#, python-format #, python-format
msgid "%(value)s is not a valid remote_id" 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 #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
#, python-format #, python-format
msgid "%(value)s is not a valid username" msgid "%(value)s is not a valid username"
msgstr "" msgstr "%(value)s ist kein gültiger Username"
#: bookwyrm/models/fields.py:164 #: bookwyrm/models/fields.py:164
#, fuzzy #, fuzzy
@ -63,23 +63,23 @@ msgstr "Servername"
#: bookwyrm/models/fields.py:169 #: bookwyrm/models/fields.py:169
msgid "A user with that username already exists." msgid "A user with that username already exists."
msgstr "" msgstr "Dieser Benutzename ist bereits vergeben."
#: bookwyrm/settings.py:142 #: bookwyrm/settings.py:142
msgid "English" msgid "English"
msgstr "" msgstr "Englisch"
#: bookwyrm/settings.py:143 #: bookwyrm/settings.py:143
msgid "German" msgid "German"
msgstr "" msgstr "Deutsch"
#: bookwyrm/settings.py:144 #: bookwyrm/settings.py:144
msgid "French" msgid "French"
msgstr "" msgstr "Französisch"
#: bookwyrm/settings.py:145 #: bookwyrm/settings.py:145
msgid "Simplified Chinese" msgid "Simplified Chinese"
msgstr "" msgstr "Vereinfachtes Chinesisch"
#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
#: bookwyrm/templates/edit_author.html:5 #: bookwyrm/templates/edit_author.html:5
@ -97,7 +97,7 @@ msgstr "Bücher von %(name)s"
#: bookwyrm/templates/book.html:21 #: bookwyrm/templates/book.html:21
msgid "by" msgid "by"
msgstr "" msgstr "von"
#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
#: bookwyrm/templates/edit_book.html:5 #: bookwyrm/templates/edit_book.html:5
@ -144,8 +144,8 @@ msgstr "In OpenLibrary ansehen"
#, python-format #, python-format
msgid "(%(review_count)s review)" msgid "(%(review_count)s review)"
msgid_plural "(%(review_count)s reviews)" msgid_plural "(%(review_count)s reviews)"
msgstr[0] "" msgstr[0] "(%(review_count)s Bewertung)"
msgstr[1] "" msgstr[1] "(%(review_count)s Bewertungen)"
#: bookwyrm/templates/book.html:106 #: bookwyrm/templates/book.html:106
msgid "Add Description" msgid "Add Description"
@ -257,7 +257,7 @@ msgstr ""
#: bookwyrm/templates/discover/about.html:13 #: bookwyrm/templates/discover/about.html:13
#: bookwyrm/templates/discover/about.html:29 #: bookwyrm/templates/discover/about.html:29
msgid "Privacy Policy" msgid "Privacy Policy"
msgstr "" msgstr "Datenschutzerklärung"
#: bookwyrm/templates/discover/discover.html:6 #: bookwyrm/templates/discover/discover.html:6
msgid "Recent Books" msgid "Recent Books"
@ -482,20 +482,20 @@ msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszul
#, fuzzy #, fuzzy
#| msgid "Read" #| msgid "Read"
msgid "To Read" msgid "To Read"
msgstr "Lesen" msgstr "Auf der Leseliste"
#: bookwyrm/templates/feed/feed_layout.html:24 #: bookwyrm/templates/feed/feed_layout.html:24
#: bookwyrm/templates/user/shelf.html:24 #: bookwyrm/templates/user/shelf.html:24
#, fuzzy #, fuzzy
#| msgid "Start reading" #| msgid "Start reading"
msgid "Currently Reading" msgid "Currently Reading"
msgstr "Zu lesen beginnen" msgstr "Gerade lesend"
#: bookwyrm/templates/feed/feed_layout.html:25 #: bookwyrm/templates/feed/feed_layout.html:25
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
#: bookwyrm/templates/user/shelf.html:24 #: bookwyrm/templates/user/shelf.html:24
msgid "Read" msgid "Read"
msgstr "Lesen" msgstr "Gelesen"
#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26 #: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
#: bookwyrm/templates/snippets/goal_card.html:6 #: bookwyrm/templates/snippets/goal_card.html:6
@ -1268,7 +1268,7 @@ msgstr ""
#: bookwyrm/templates/snippets/book_titleby.html:3 #: bookwyrm/templates/snippets/book_titleby.html:3
#, python-format #, python-format
msgid "<a href=\"%(path)s\">%(title)s</a> by " msgid "<a href=\"%(path)s\">%(title)s</a> by "
msgstr "<a href=\"%(path)s\">%(title)s</a> von" msgstr "<a href=\"%(path)s\">%(title)s</a> von "
#: bookwyrm/templates/snippets/boost_button.html:8 #: bookwyrm/templates/snippets/boost_button.html:8
#: bookwyrm/templates/snippets/boost_button.html:9 #: bookwyrm/templates/snippets/boost_button.html:9
@ -1312,7 +1312,7 @@ msgstr ""
#: bookwyrm/templates/snippets/rate_action.html:14 #: bookwyrm/templates/snippets/rate_action.html:14
#: bookwyrm/templates/snippets/stars.html:3 #: bookwyrm/templates/snippets/stars.html:3
msgid "No rating" msgid "No rating"
msgstr "" msgstr "Kein Rating"
#: bookwyrm/templates/snippets/create_status_form.html:54 #: bookwyrm/templates/snippets/create_status_form.html:54
msgid "Include spoiler alert" msgid "Include spoiler alert"
@ -1327,7 +1327,7 @@ msgstr "Privat"
#: bookwyrm/templates/snippets/create_status_form.html:67 #: bookwyrm/templates/snippets/create_status_form.html:67
msgid "Post" msgid "Post"
msgstr "" msgstr "Absenden"
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
msgid "Delete these read dates?" msgid "Delete these read dates?"