mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-26 08:50:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1565 from bookwyrm-social/translation-whitespace

Browse source 
Translation whitespace
This commit is contained in:
Mouse Reeve 2021-10-24 10:55:11 -07:00 committed by GitHub
parent b4a4f91002 7502158e58
commit f2b11c6ad1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 42 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bookwyrm/templates/groups/suggested_users.html
View file

@ -36,7 +36,11 @@
{% endfor %}
</div>
{% else %}
<p>No potential members found for "{{ user_query }}"</p>
<p>
{% blocktrans trimmed %}
No potential members found for "{{ user_query }}"
{% endblocktrans %}
</p>
<br/>
{% endif %}

2
bookwyrm/templates/notifications/items/accept.html
View file

@ -13,7 +13,7 @@
{% block description %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
{% endblocktrans %}

2
bookwyrm/templates/notifications/items/fav.html
View file

@ -24,7 +24,7 @@
{% elif related_status.status_type == 'Comment' %}
{% blocktrans trimmed %}
liked your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>
liked your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>
{% endblocktrans %}
{% elif related_status.status_type == 'Quotation' %}

4
bookwyrm/templates/notifications/items/invite.html
View file

@ -12,8 +12,8 @@
{% endblock %}
{% block description %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a>
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
invited you to join the group "<a href="{{ group_path }}">{{ group_name }}</a>"
{% endblocktrans %}
<div class="row shrink">
{% include 'snippets/join_invitation_buttons.html' with group=notification.related_group %}

7
bookwyrm/templates/notifications/items/item_layout.html
View file

@ -1,4 +1,3 @@
{% load humanize %}
{% load bookwyrm_tags %}
{% related_status notification as related_status %}
<div class="notification is-clickable {% if notification.id in unread %} is-primary{% endif %}" data-href="{% block primary_link %}{% endblock %}">
@ -10,10 +9,8 @@
<div class="block">
<p>
{% if notification.related_user %}
<a href="{{ notification.related_user.local_path }}">
{% include 'snippets/avatar.html' with user=notification.related_user %}
{{ notification.related_user.display_name }}
</a>
<a href="{{ notification.related_user.local_path }}">{% include 'snippets/avatar.html' with user=notification.related_user %}
{{ notification.related_user.display_name }}</a>
{% endif %}
{% block description %}{% endblock %}
</p>

2
bookwyrm/templates/notifications/items/join.html
View file

@ -13,7 +13,7 @@
{% block description %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has joined your group "<a href="{{ group_path }}">{{ group_name }}</a>"
{% endblocktrans %}

2
bookwyrm/templates/notifications/items/leave.html
View file

@ -13,7 +13,7 @@
{% block description %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
{% endblocktrans %}

10
bookwyrm/templates/notifications/items/remove.html
View file

@ -14,14 +14,14 @@
{% block description %}
{% if notification.related_user %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
{% endblocktrans %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
{% endblocktrans %}
{% else %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a>" group
{% endblocktrans %}
{% endif %}

6
bookwyrm/templates/notifications/items/update.html
View file

@ -13,15 +13,15 @@
{% block description %}
{% if notification.notification_type == 'GROUP_PRIVACY' %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has changed the privacy level for <a href="{{ group_path }}">{{ group_name }}</a>
{% endblocktrans %}
{% elif notification.notification_type == 'GROUP_NAME' %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has changed the name of <a href="{{ group_path }}">{{ group_name }}</a>
{% endblocktrans %}
{% else %}
{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
has changed the description of <a href="{{ group_path }}">{{ group_name }}</a>
{% endblocktrans %}
{% endif %}

4
bookwyrm/templates/snippets/remove_from_group_button.html
View file

@ -13,10 +13,10 @@
<input type="hidden" name="group" value="{{ group.id }}">
<input type="hidden" name="user" value="{{ user.username }}">
<button id="submit_button" class="button is-small is-danger is-light is-hidden" type="submit" data-id="member_{{ member.id }}">
{% blocktrans with username=user.localname %} Confirm {% endblocktrans %}
{% trans "Confirm" %}
</button>
<button id="hide_submit_button" data-controls="submit_button" class="button is-small" type="button" aria-pressed="false">
{% blocktrans with username=user.localname %} Remove {% endblocktrans %}
{% trans "Remove" %}
</button>
</form>
</div>

5
bw-dev
View file

@ -105,11 +105,8 @@ case "$CMD" in
collectstatic)
runweb python manage.py collectstatic --no-input
;;
add_locale)
runweb django-admin makemessages --no-wrap --ignore=venv -l $@
;;
makemessages)
runweb django-admin makemessages --no-wrap --ignore=venv --all $@
runweb django-admin makemessages --no-wrap --ignore=venv -l en_US $@
;;
compilemessages)
runweb django-admin compilemessages --ignore venv $@

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

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-22 17:47+0000\n"
"POT-Creation-Date: 2021-10-24 14:09+0000\n"
"PO-Revision-Date: 2021-02-28 17:19-0800\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\n"
@ -549,6 +549,7 @@ msgstr ""
#: bookwyrm/templates/book/edit/edit_book.html:97
#: bookwyrm/templates/groups/members.html:16
#: bookwyrm/templates/landing/password_reset.html:30
#: bookwyrm/templates/snippets/remove_from_group_button.html:16
msgid "Confirm"
msgstr ""
@ -1321,6 +1322,11 @@ msgid_plural "%(shared_books)s books on your shelves"
msgstr[0] ""
msgstr[1] ""
#: bookwyrm/templates/groups/suggested_users.html:40
#, python-format
msgid "No potential members found for \"%(user_query)s\""
msgstr ""
#: bookwyrm/templates/groups/user_groups.html:15
msgid "Manager"
msgstr ""
@ -1777,6 +1783,7 @@ msgid "Set"
msgstr ""
#: bookwyrm/templates/lists/list.html:92
#: bookwyrm/templates/snippets/remove_from_group_button.html:19
#: bookwyrm/templates/snippets/shelf_selector.html:26
msgid "Remove"
msgstr ""
@ -1833,10 +1840,7 @@ msgstr ""
#: bookwyrm/templates/notifications/items/accept.html:16
#, python-format
msgid ""
"\n"
" accepted your invitation to join group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
" "
msgid "accepted your invitation to join group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
msgstr ""
#: bookwyrm/templates/notifications/items/add.html:24
@ -1876,7 +1880,7 @@ msgstr ""
#: bookwyrm/templates/notifications/items/fav.html:25
#, python-format
msgid "liked your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
msgid "liked your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
msgstr ""
#: bookwyrm/templates/notifications/items/fav.html:31
@ -1904,22 +1908,17 @@ msgstr ""
#: bookwyrm/templates/notifications/items/invite.html:15
#, python-format
msgid "invited you to join the group <a href=\"%(group_path)s\">%(group_name)s</a>"
msgid "invited you to join the group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
msgstr ""
#: bookwyrm/templates/notifications/items/join.html:16
#, python-format
msgid ""
"\n"
"has joined your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
msgid "has joined your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
msgstr ""
#: bookwyrm/templates/notifications/items/leave.html:16
#, python-format
msgid ""
"\n"
" has left your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
" "
msgid "has left your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
msgstr ""
#: bookwyrm/templates/notifications/items/mention.html:20
@ -1944,17 +1943,12 @@ msgstr ""
#: bookwyrm/templates/notifications/items/remove.html:17
#, python-format
msgid ""
" \n"
"has been removed from your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\"\n"
msgid "has been removed from your group \"<a href=\"%(group_path)s\">%(group_name)s</a>\""
msgstr ""
#: bookwyrm/templates/notifications/items/remove.html:23
#, python-format
msgid ""
"\n"
" You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a> group\"\n"
" "
msgid "You have been removed from the \"<a href=\"%(group_path)s\">%(group_name)s</a>\" group"
msgstr ""
#: bookwyrm/templates/notifications/items/reply.html:21
@ -1984,26 +1978,17 @@ msgstr ""
#: bookwyrm/templates/notifications/items/update.html:16
#, python-format
msgid ""
"\n"
" has changed the privacy level for <a href=\"%(group_path)s\">%(group_name)s</a>\n"
" "
msgid "has changed the privacy level for <a href=\"%(group_path)s\">%(group_name)s</a>"
msgstr ""
#: bookwyrm/templates/notifications/items/update.html:20
#, python-format
msgid ""
"\n"
" has changed the name of <a href=\"%(group_path)s\">%(group_name)s</a>\n"
" "
msgid "has changed the name of <a href=\"%(group_path)s\">%(group_name)s</a>"
msgstr ""
#: bookwyrm/templates/notifications/items/update.html:24
#, python-format
msgid ""
"\n"
" has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>\n"
" "
msgid "has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>"
msgstr ""
#: bookwyrm/templates/notifications/notifications_page.html:18
@ -3460,14 +3445,6 @@ msgstr ""
msgid "Sign Up"
msgstr ""
#: bookwyrm/templates/snippets/remove_from_group_button.html:16
msgid " Confirm "
msgstr ""
#: bookwyrm/templates/snippets/remove_from_group_button.html:19
msgid " Remove "
msgstr ""
#: bookwyrm/templates/snippets/report_button.html:6
msgid "Report"
msgstr ""