mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-22 09:31:08 +00:00
Code Issues Projects Releases Wiki Activity

Simplifies translation strings

Browse source
This commit is contained in:
Mouse Reeve 2021-02-28 08:42:25 -08:00
parent 9247a0f6f7
commit 4df62a8ebd
5 changed files with 34 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/templates/import_status.html
View file

@ -7,11 +7,11 @@
<h1 class="title">{% trans "Import Status" %}</h1> <h1 class="title">{% trans "Import Status" %}</h1>
<p> <p>
{% trans "Import started: " %}{{ job.created_date | naturaltime }} {% trans "Import started:" %} {{ job.created_date | naturaltime }}
</p> </p>
{% if job.complete %} {% if job.complete %}
<p> <p>
{% trans "Import completed: " %}{{ task.date_done | naturaltime }} {% trans "Import completed:" %} {{ task.date_done | naturaltime }}
</p> </p>
{% elif task.failed %} {% elif task.failed %}
<div class="notification is-danger">{% trans "TASK FAILED" %}</div> <div class="notification is-danger">{% trans "TASK FAILED" %}</div>

2
bookwyrm/templates/layout.html
View file

@ -35,7 +35,7 @@
<div class="control"> <div class="control">
<button class="button" type="submit"> <button class="button" type="submit">
<span class="icon icon-search" title="{% trans 'Search' %}"> <span class="icon icon-search" title="{% trans 'Search' %}">
<span class="is-sr-only">{% trans "search" %}</span> <span class="is-sr-only">{% trans "Search" %}</span>
</span> </span>
</button> </button>
</div> </div>

20
bookwyrm/templates/notifications.html
View file

@ -42,23 +42,13 @@
{% include 'snippets/avatar.html' with user=notification.related_user %} {% include 'snippets/avatar.html' with user=notification.related_user %}
{% include 'snippets/username.html' with user=notification.related_user %} {% include 'snippets/username.html' with user=notification.related_user %}
{% if notification.notification_type == 'FAVORITE' %} {% if notification.notification_type == 'FAVORITE' %}
{% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %} {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
favorited your
<a href="{{ related_path }}">{{ preview_name }}</a>
{% endblocktrans %}
{% elif notification.notification_type == 'MENTION' %} {% elif notification.notification_type == 'MENTION' %}
{% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %} {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}mentioned you in a <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
mentioned you in a
<a href="{{ related_path }}">{{ preview_name }}</a>
{% endblocktrans %}
{% elif notification.notification_type == 'REPLY' %} {% elif notification.notification_type == 'REPLY' %}
{% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %} {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">{{ preview_name }}</a>{% endblocktrans %}
<a href="{{ related_path }}">replied</a>
to your
<a href="{{ parent_path }}">{{ preview_name }}</a>
{% endblocktrans %}
{% elif notification.notification_type == 'FOLLOW' %} {% elif notification.notification_type == 'FOLLOW' %}
{% trans "followed you" %} {% trans "followed you" %}
@ -69,9 +59,7 @@
{% include 'snippets/follow_request_buttons.html' with user=notification.related_user %} {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
</div> </div>
{% elif notification.notification_type == 'BOOST' %} {% elif notification.notification_type == 'BOOST' %}
{% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %} {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
boosted your <a href="{{ related_path }}">{{ preview_name }}</a>
{% endblocktrans %}
{% elif notification.notification_type == 'ADD' %} {% elif notification.notification_type == 'ADD' %}
{% if notification.related_list_item.approved %}{% trans "added" %}{% else %}{% trans "suggested adding" %}{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>" {% if notification.related_list_item.approved %}{% trans "added" %}{% else %}{% trans "suggested adding" %}{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
{% endif %} {% endif %}

2
bookwyrm/templates/settings/site.html
View file

@ -83,7 +83,7 @@
</section> </section>
<footer class="block"> <footer class="block">
<button class="button is-primary" type="submit">{% trans "Save Changes" %}</button> <button class="button is-primary" type="submit">{% trans "Save" %}</button>
</footer> </footer>
</form> </form>
{% endblock %} {% endblock %}

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1.1\n" "Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-27 18:32-0800\n" "POT-Creation-Date: 2021-02-28 08:42-0800\n"
"PO-Revision-Date: 2021-02-27 13:50+PST\n" "PO-Revision-Date: 2021-02-27 13:50+PST\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n" "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n" "Language-Team: Mouse Reeve <LL@li.org>\n"
@ -67,6 +67,7 @@ msgstr ""
#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75 #: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:47 #: bookwyrm/templates/preferences/edit_user.html:47
#: bookwyrm/templates/settings/site.html:86
#: bookwyrm/templates/snippets/progress_update.html:21 #: bookwyrm/templates/snippets/progress_update.html:21
#: bookwyrm/templates/snippets/readthrough.html:61 #: bookwyrm/templates/snippets/readthrough.html:61
#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@ -381,11 +382,11 @@ msgid "Import Status"
msgstr "" msgstr ""
#: bookwyrm/templates/import_status.html:10 #: bookwyrm/templates/import_status.html:10
msgid "Import started: " msgid "Import started:"
msgstr "" msgstr ""
#: bookwyrm/templates/import_status.html:14 #: bookwyrm/templates/import_status.html:14
msgid "Import completed: " msgid "Import completed:"
msgstr "" msgstr ""
#: bookwyrm/templates/import_status.html:17 #: bookwyrm/templates/import_status.html:17
@ -447,14 +448,11 @@ msgstr ""
msgid "Sorry! This invite code is no longer valid." msgid "Sorry! This invite code is no longer valid."
msgstr "" msgstr ""
#: bookwyrm/templates/layout.html:37 bookwyrm/templates/lists/list.html:62 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
#: bookwyrm/templates/lists/list.html:62
msgid "Search" msgid "Search"
msgstr "" msgstr ""
#: bookwyrm/templates/layout.html:38 bookwyrm/templates/lists/list.html:63
msgid "search"
msgstr ""
#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
msgid "Main navigation menu" msgid "Main navigation menu"
msgstr "" msgstr ""
@ -575,6 +573,10 @@ msgstr ""
msgid "Search for a book" msgid "Search for a book"
msgstr "" msgstr ""
#: bookwyrm/templates/lists/list.html:63
msgid "search"
msgstr ""
#: bookwyrm/templates/lists/list.html:69 #: bookwyrm/templates/lists/list.html:69
msgid "Clear search" msgid "Clear search"
msgstr "" msgstr ""
@ -641,66 +643,48 @@ msgstr ""
#: bookwyrm/templates/notifications.html:45 #: bookwyrm/templates/notifications.html:45
#, python-format #, python-format
msgid "" msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
"\n" msgstr ""
" favorited your\n"
" <a href=\"%(related_path)s\">" #: bookwyrm/templates/notifications.html:48
"%(preview_name)s</a>\n" #, python-format
" " msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:51 #: bookwyrm/templates/notifications.html:51
#, python-format #, python-format
msgid "" msgid ""
"\n" "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
" mentioned you in a\n" "%(preview_name)s</a>"
" <a href=\"%(related_path)s\">"
"%(preview_name)s</a>\n"
" "
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:57 #: bookwyrm/templates/notifications.html:54
#, python-format
msgid ""
"\n"
" <a href=\"%(related_path)s\">replied</a>\n"
" to your\n"
" <a href=\"%(parent_path)s\">"
"%(preview_name)s</a>\n"
" "
msgstr ""
#: bookwyrm/templates/notifications.html:64
msgid "followed you" msgid "followed you"
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:67 #: bookwyrm/templates/notifications.html:57
msgid "sent you a follow request" msgid "sent you a follow request"
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:72 #: bookwyrm/templates/notifications.html:62
#, python-format #, python-format
msgid "" msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
"\n"
" boosted your <a href=\"%(related_path)s\">"
"%(preview_name)s</a>\n"
" "
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:76 #: bookwyrm/templates/notifications.html:64
msgid "added" msgid "added"
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:76 #: bookwyrm/templates/notifications.html:64
msgid "suggested adding" msgid "suggested adding"
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:79 #: bookwyrm/templates/notifications.html:67
#, python-format #, python-format
msgid " your <a href=\"/import/%(related_id)s\">import</a> completed." msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
msgstr "" msgstr ""
#: bookwyrm/templates/notifications.html:111 #: bookwyrm/templates/notifications.html:99
msgid "You're all caught up!" msgid "You're all caught up!"
msgstr "" msgstr ""
@ -968,10 +952,6 @@ msgstr ""
msgid "Registration closed text:" msgid "Registration closed text:"
msgstr "" msgstr ""
#: bookwyrm/templates/settings/site.html:86
msgid "Save Changes"
msgstr ""
#: bookwyrm/templates/snippets/block_button.html:5 #: bookwyrm/templates/snippets/block_button.html:5
msgid "Block" msgid "Block"
msgstr "" msgstr ""