rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2021-04-05 11:11:06 -07:00
parent 411dd1b14d e61ed73894
commit e35befb6a2
11 changed files with 345 additions and 408 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/forms.py
View file

@ -233,7 +233,7 @@ class InviteRequestForm(CustomForm):
class CreateInviteForm(CustomForm): class CreateInviteForm(CustomForm):
class Meta: class Meta:
model = models.SiteInvite model = models.SiteInvite
exclude = ["code", "user", "times_used"] exclude = ["code", "user", "times_used", "invitees"]
widgets = { widgets = {
"expiry": ExpiryWidget( "expiry": ExpiryWidget(
choices=[ choices=[

2
bookwyrm/templates/lists/lists.html
View file

@ -11,7 +11,7 @@
<h1 class="title"> <h1 class="title">
{% trans "Lists" %} {% trans "Lists" %}
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<a class="help has-text-weight-normal" href="{% url 'user-lists' request.user|username %}">Your lists</a> <a class="help has-text-weight-normal" href="{% url 'user-lists' request.user|username %}">{% trans "Your Lists" %}</a>
{% endif %} {% endif %}
</h1> </h1>
</div> </div>

2
bookwyrm/templates/snippets/table-sort-header.html
View file

@ -3,7 +3,7 @@
{{ text }} {{ text }}
{% if sort == field %} {% if sort == field %}
<span class="icon icon-arrow-up"> <span class="icon icon-arrow-up">
<span class="is-sr-only">{% trans "Sorted asccending" %}</span> <span class="is-sr-only">{% trans "Sorted ascending" %}</span>
</span> </span>
{% elif sort == "-"|add:field %} {% elif sort == "-"|add:field %}
<span class="icon icon-arrow-down"> <span class="icon icon-arrow-down">

1
instances.md
View file

@ -2,3 +2,4 @@
| name | url | admin contact | open registration | | name | url | admin contact | open registration |
| :--- | :-- | :------------ | :---------------- | | :--- | :-- | :------------ | :---------------- |
| bookwyrm.social | http://bookwyrm.social/ | mousereeve@riseup.net / @tripofmice@friend.camp | ❌ | | bookwyrm.social | http://bookwyrm.social/ | mousereeve@riseup.net / @tripofmice@friend.camp | ❌ |
| wyrms.de | https://wyrms.de/ | wyrms@tofuwabo.hu / @tofuwabohu@subversive.zone | ❌ |

2
locale/de_DE/LC_MESSAGES/django.po
View file

@ -2565,7 +2565,7 @@ msgstr "Zu dieser Edition wechseln"
#: bookwyrm/templates/snippets/table-sort-header.html:6 #: bookwyrm/templates/snippets/table-sort-header.html:6
#, fuzzy #, fuzzy
#| msgid "Started reading" #| msgid "Started reading"
msgid "Sorted asccending" msgid "Sorted ascending"
msgstr "Zu lesen angefangen" msgstr "Zu lesen angefangen"
#: bookwyrm/templates/snippets/table-sort-header.html:10 #: bookwyrm/templates/snippets/table-sort-header.html:10

2
locale/en_US/LC_MESSAGES/django.po
View file

@ -2408,7 +2408,7 @@ msgid "Switch to this edition"
msgstr "" msgstr ""
#: bookwyrm/templates/snippets/table-sort-header.html:6 #: bookwyrm/templates/snippets/table-sort-header.html:6
msgid "Sorted asccending" msgid "Sorted ascending"
msgstr "" msgstr ""
#: bookwyrm/templates/snippets/table-sort-header.html:10 #: bookwyrm/templates/snippets/table-sort-header.html:10

2
locale/es/LC_MESSAGES/django.po
View file

@ -2557,7 +2557,7 @@ msgstr "Cambiar a esta edición"
#: bookwyrm/templates/snippets/table-sort-header.html:6 #: bookwyrm/templates/snippets/table-sort-header.html:6
#, fuzzy #, fuzzy
#| msgid "Started reading" #| msgid "Started reading"
msgid "Sorted asccending" msgid "Sorted ascending"
msgstr "Lectura se empezó" msgstr "Lectura se empezó"
#: bookwyrm/templates/snippets/table-sort-header.html:10 #: bookwyrm/templates/snippets/table-sort-header.html:10

BIN
locale/fr_FR/LC_MESSAGES/django.mo
View file

Binary file not shown.

738
locale/fr_FR/LC_MESSAGES/django.po
View file

File diff suppressed because it is too large Load diff

BIN
locale/zh_CN/LC_MESSAGES/django.mo
View file

Binary file not shown.

2
locale/zh_CN/LC_MESSAGES/django.po
View file

@ -2413,7 +2413,7 @@ msgid "Switch to this edition"
msgstr "切换到此版本" msgstr "切换到此版本"
#: bookwyrm/templates/snippets/table-sort-header.html:6 #: bookwyrm/templates/snippets/table-sort-header.html:6
msgid "Sorted asccending" msgid "Sorted ascending"
msgstr "升序排序" msgstr "升序排序"
#: bookwyrm/templates/snippets/table-sort-header.html:10 #: bookwyrm/templates/snippets/table-sort-header.html:10