diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html index ca87113f..d609a227 100644 --- a/bookwyrm/templates/import_status.html +++ b/bookwyrm/templates/import_status.html @@ -7,11 +7,11 @@

{% trans "Import Status" %}

- {% trans "Import started: " %}{{ job.created_date | naturaltime }} + {% trans "Import started:" %} {{ job.created_date | naturaltime }}

{% if job.complete %}

- {% trans "Import completed: " %}{{ task.date_done | naturaltime }} + {% trans "Import completed:" %} {{ task.date_done | naturaltime }}

{% elif task.failed %}
{% trans "TASK FAILED" %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 39b78196..c4499c4e 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -35,7 +35,7 @@
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html index 20d9f254..ea9f24b8 100644 --- a/bookwyrm/templates/notifications.html +++ b/bookwyrm/templates/notifications.html @@ -42,23 +42,13 @@ {% include 'snippets/avatar.html' with user=notification.related_user %} {% include 'snippets/username.html' with user=notification.related_user %} {% if notification.notification_type == 'FAVORITE' %} - {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %} - favorited your - {{ preview_name }} - {% endblocktrans %} + {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}favorited your {{ preview_name }}{% endblocktrans %} {% elif notification.notification_type == 'MENTION' %} - {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %} - mentioned you in a - {{ preview_name }} - {% endblocktrans %} + {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}mentioned you in a {{ preview_name }}{% endblocktrans %} {% 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 %} - replied - to your - {{ preview_name }} - {% endblocktrans %} + {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}replied to your {{ preview_name }}{% endblocktrans %} {% elif notification.notification_type == 'FOLLOW' %} {% trans "followed you" %} @@ -69,9 +59,7 @@ {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %} {% elif notification.notification_type == 'BOOST' %} - {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %} - boosted your {{ preview_name }} - {% endblocktrans %} + {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}boosted your {{ preview_name }}{% endblocktrans %} {% 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 "{{ notification.related_list_item.book_list.name }}" {% endif %} diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html index 1a502f16..2716ea3d 100644 --- a/bookwyrm/templates/settings/site.html +++ b/bookwyrm/templates/settings/site.html @@ -83,7 +83,7 @@ {% endblock %} diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index b849b903..4d140e52 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\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" "Last-Translator: Mouse Reeve \n" "Language-Team: Mouse Reeve \n" @@ -67,6 +67,7 @@ msgstr "" #: 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/preferences/edit_user.html:47 +#: bookwyrm/templates/settings/site.html:86 #: bookwyrm/templates/snippets/progress_update.html:21 #: bookwyrm/templates/snippets/readthrough.html:61 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 @@ -381,11 +382,11 @@ msgid "Import Status" msgstr "" #: bookwyrm/templates/import_status.html:10 -msgid "Import started: " +msgid "Import started:" msgstr "" #: bookwyrm/templates/import_status.html:14 -msgid "Import completed: " +msgid "Import completed:" msgstr "" #: bookwyrm/templates/import_status.html:17 @@ -447,14 +448,11 @@ msgstr "" msgid "Sorry! This invite code is no longer valid." 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" 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 msgid "Main navigation menu" msgstr "" @@ -575,6 +573,10 @@ msgstr "" msgid "Search for a book" msgstr "" +#: bookwyrm/templates/lists/list.html:63 +msgid "search" +msgstr "" + #: bookwyrm/templates/lists/list.html:69 msgid "Clear search" msgstr "" @@ -641,66 +643,48 @@ msgstr "" #: bookwyrm/templates/notifications.html:45 #, python-format -msgid "" -"\n" -" favorited your\n" -" " -"%(preview_name)s\n" -" " +msgid "favorited your %(preview_name)s" +msgstr "" + +#: bookwyrm/templates/notifications.html:48 +#, python-format +msgid "mentioned you in a %(preview_name)s" msgstr "" #: bookwyrm/templates/notifications.html:51 #, python-format msgid "" -"\n" -" mentioned you in a\n" -" " -"%(preview_name)s\n" -" " +"replied to your " +"%(preview_name)s" msgstr "" -#: bookwyrm/templates/notifications.html:57 -#, python-format -msgid "" -"\n" -" replied\n" -" to your\n" -" " -"%(preview_name)s\n" -" " -msgstr "" - -#: bookwyrm/templates/notifications.html:64 +#: bookwyrm/templates/notifications.html:54 msgid "followed you" msgstr "" -#: bookwyrm/templates/notifications.html:67 +#: bookwyrm/templates/notifications.html:57 msgid "sent you a follow request" msgstr "" -#: bookwyrm/templates/notifications.html:72 +#: bookwyrm/templates/notifications.html:62 #, python-format -msgid "" -"\n" -" boosted your " -"%(preview_name)s\n" -" " +msgid "boosted your %(preview_name)s" msgstr "" -#: bookwyrm/templates/notifications.html:76 +#: bookwyrm/templates/notifications.html:64 msgid "added" msgstr "" -#: bookwyrm/templates/notifications.html:76 +#: bookwyrm/templates/notifications.html:64 msgid "suggested adding" msgstr "" -#: bookwyrm/templates/notifications.html:79 +#: bookwyrm/templates/notifications.html:67 #, python-format msgid " your import completed." msgstr "" -#: bookwyrm/templates/notifications.html:111 +#: bookwyrm/templates/notifications.html:99 msgid "You're all caught up!" msgstr "" @@ -968,10 +952,6 @@ msgstr "" msgid "Registration closed text:" msgstr "" -#: bookwyrm/templates/settings/site.html:86 -msgid "Save Changes" -msgstr "" - #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" msgstr ""