Merge pull request #1363 from bookwyrm-social/quote-page

Create and view quotation page numbers
This commit is contained in:
Mouse Reeve 2021-09-05 16:43:43 -07:00 committed by GitHub
commit 07ba880ff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 444 additions and 164 deletions

View file

@ -70,6 +70,8 @@ class Quotation(Comment):
"""a quote and commentary on a book"""
quote: str
position: int = None
positionMode: str = None
type: str = "Quotation"

View file

@ -101,6 +101,8 @@ class QuotationForm(CustomForm):
"content_warning",
"sensitive",
"privacy",
"position",
"position_mode",
]

View file

@ -0,0 +1,34 @@
# Generated by Django 3.2.4 on 2021-09-05 22:33
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("bookwyrm", "0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724"),
]
operations = [
migrations.AddField(
model_name="quotation",
name="position",
field=models.IntegerField(
blank=True,
null=True,
validators=[django.core.validators.MinValueValidator(0)],
),
),
migrations.AddField(
model_name="quotation",
name="position_mode",
field=models.CharField(
blank=True,
choices=[("PG", "page"), ("PCT", "percent")],
default="PG",
max_length=3,
null=True,
),
),
]

View file

@ -290,6 +290,16 @@ class Quotation(BookStatus):
"""like a review but without a rating and transient"""
quote = fields.HtmlField()
position = models.IntegerField(
validators=[MinValueValidator(0)], null=True, blank=True
)
position_mode = models.CharField(
max_length=3,
choices=ProgressMode.choices,
default=ProgressMode.PAGE,
null=True,
blank=True,
)
@property
def pure_content(self):

View file

@ -26,13 +26,32 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
<label class="label" for="progress_{{ uuid }}">{% trans "Progress:" %}</label>
<div class="field has-addons mb-0">
<div class="control">
<input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress_{{ uuid }}">
<input
aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
class="input"
type="number"
min="0"
name="progress"
size="3"
value="{% firstof draft.progress readthrough.progress '' %}"
id="progress_{{ uuid }}"
>
</div>
<div class="control">
<div class="select">
<select name="progress_mode" aria-label="Progress mode">
<option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
<option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
<option
value="PG"
{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}
>
{% trans "pages" %}
</option>
<option
value="PCT"
{% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}
>
{% trans "percent" %}
</option>
</select>
</div>
</div>

View file

@ -11,8 +11,6 @@ draft: the content of an existing Status object to be edited (used in delete and
uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
{% endcomment %}
{% with type="quotation" %}
{% block pre_content_additions %}
<div class="field">
<label class="label" for="id_quote_{{ book.id }}_{{ type }}">
@ -29,6 +27,39 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
>{{ draft.quote|default:'' }}</textarea>
</div>
</div>
<div class="field">
<label class="label" for="position_{{ uuid }}">{% trans "Position:" %}</label>
<div class="field has-addons mb-0">
<div class="control">
<div class="select">
<select name="position_mode" aria-label="Position mode">
<option
value="PG"
{% if draft.position_mode == 'PG' or not draft %}selected{% endif %}
>
{% trans "On page:" %}
</option>
<option
value="PCT"
{% if draft.position_mode == 'PCT' %}selected{% endif %}
>
{% trans "At percent:" %}
</option>
</select>
</div>
</div>
<div class="control">
<input
aria-label="{% if draft.position_mode == 'PG' %}Page{% else %}Percent{% endif %}"
class="input"
type="number"
min="0"
name="position"
size="3"
value="{% firstof draft.position '' %}"
id="position_{{ uuid }}"
>
</div>
</div>
</div>
{% endblock %}
{% endwith %}

View file

@ -2,6 +2,7 @@
{% load markdown %}
{% load i18n %}
{% load static %}
{% load humanize %}
{% with status_type=status.status_type %}
<div
@ -95,7 +96,16 @@
<div class="quote block">
<blockquote dir="auto" class="content mb-2">{{ status.quote|safe }}</blockquote>
<p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
<p>
&mdash; {% include 'snippets/book_titleby.html' with book=status.book %}
{% if status.position %}
{% if status.position_mode == 'PG' %}
{% blocktrans with page=status.position|intcomma %}(Page {{ page }}){% endblocktrans %}
{% else %}
{% blocktrans with percent=status.position %}({{ percent }}%){% endblocktrans %}
{% endif %}
{% endif %}
</p>
</div>
{% endif %}

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-05 21:43+0000\n"
"POT-Creation-Date: 2021-09-05 23:09+0000\n"
"PO-Revision-Date: 2021-03-02 17:19-0800\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\n"
@ -18,67 +18,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: bookwyrm/forms.py:233
#: bookwyrm/forms.py:235
#, fuzzy
#| msgid "A user with that username already exists."
msgid "A user with this email already exists."
msgstr "Dieser Benutzename ist bereits vergeben."
#: bookwyrm/forms.py:247
#: bookwyrm/forms.py:249
msgid "One Day"
msgstr "Ein Tag"
#: bookwyrm/forms.py:248
#: bookwyrm/forms.py:250
msgid "One Week"
msgstr "Eine Woche"
#: bookwyrm/forms.py:249
#: bookwyrm/forms.py:251
msgid "One Month"
msgstr "Ein Monat"
#: bookwyrm/forms.py:250
#: bookwyrm/forms.py:252
msgid "Does Not Expire"
msgstr "Läuft nicht aus"
#: bookwyrm/forms.py:255
#: bookwyrm/forms.py:257
#, python-format
msgid "%(count)d uses"
msgstr "%(count)d Benutzungen"
#: bookwyrm/forms.py:258
#: bookwyrm/forms.py:260
#, fuzzy
#| msgid "Unlisted"
msgid "Unlimited"
msgstr "Ungelistet"
#: bookwyrm/forms.py:308
#: bookwyrm/forms.py:310
msgid "List Order"
msgstr ""
#: bookwyrm/forms.py:309
#: bookwyrm/forms.py:311
#, fuzzy
#| msgid "Title"
msgid "Book Title"
msgstr "Titel"
#: bookwyrm/forms.py:310
#: bookwyrm/templates/snippets/create_status/review.html:25
#: bookwyrm/forms.py:312
#: bookwyrm/templates/snippets/create_status/review.html:23
#: bookwyrm/templates/user/shelf/shelf.html:117
#: bookwyrm/templates/user/shelf/shelf.html:148
msgid "Rating"
msgstr ""
#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
msgid "Sort By"
msgstr ""
#: bookwyrm/forms.py:316
#: bookwyrm/forms.py:318
#, fuzzy
#| msgid "Started reading"
msgid "Ascending"
msgstr "Zu lesen angefangen"
#: bookwyrm/forms.py:317
#: bookwyrm/forms.py:319
#, fuzzy
#| msgid "Started reading"
msgid "Descending"
@ -536,7 +536,7 @@ msgid "Back"
msgstr "Zurück"
#: bookwyrm/templates/book/edit_book.html:127
#: bookwyrm/templates/snippets/create_status/review.html:18
#: bookwyrm/templates/snippets/create_status/review.html:16
msgid "Title:"
msgstr "Titel:"
@ -2728,19 +2728,19 @@ msgstr ""
msgid "Progress:"
msgstr "Fortschritt:"
#: bookwyrm/templates/snippets/create_status/comment.html:34
#: bookwyrm/templates/snippets/create_status/comment.html:47
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
#: bookwyrm/templates/snippets/readthrough_form.html:22
msgid "pages"
msgstr "Seiten"
#: bookwyrm/templates/snippets/create_status/comment.html:35
#: bookwyrm/templates/snippets/create_status/comment.html:53
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
#: bookwyrm/templates/snippets/readthrough_form.html:23
msgid "percent"
msgstr "Prozent"
#: bookwyrm/templates/snippets/create_status/comment.html:41
#: bookwyrm/templates/snippets/create_status/comment.html:60
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
#, python-format
msgid "of %(pages)s pages"
@ -2789,25 +2789,43 @@ msgstr "Privat"
msgid "Post"
msgstr "Absenden"
#: bookwyrm/templates/snippets/create_status/quotation.html:19
#: bookwyrm/templates/snippets/create_status/quotation.html:17
#, fuzzy
#| msgid "Quote"
msgid "Quote:"
msgstr "Zitieren"
#: bookwyrm/templates/snippets/create_status/quotation.html:27
#: bookwyrm/templates/snippets/create_status/quotation.html:25
#, fuzzy, python-format
#| msgid "Editions of %(book_title)s"
msgid "An excerpt from '%(book_title)s'"
msgstr "Editionen von %(book_title)s"
#: bookwyrm/templates/snippets/create_status/review.html:20
#: bookwyrm/templates/snippets/create_status/quotation.html:31
#, fuzzy
#| msgid "Description:"
msgid "Position:"
msgstr "Beschreibung:"
#: bookwyrm/templates/snippets/create_status/quotation.html:40
#, fuzzy
#| msgid "pages"
msgid "On page:"
msgstr "Seiten"
#: bookwyrm/templates/snippets/create_status/quotation.html:46
#, fuzzy
#| msgid "percent"
msgid "At percent:"
msgstr "Prozent"
#: bookwyrm/templates/snippets/create_status/review.html:18
#, fuzzy, python-format
#| msgid "Editions of %(book_title)s"
msgid "Your review of '%(book_title)s'"
msgstr "Editionen von %(book_title)s"
#: bookwyrm/templates/snippets/create_status/review.html:32
#: bookwyrm/templates/snippets/create_status/review.html:30
#, fuzzy
#| msgid "Review"
msgid "Review:"
@ -3102,17 +3120,29 @@ msgstr "Auf Leseliste setzen"
msgid "Remove from %(name)s"
msgstr "Listen: %(username)s"
#: bookwyrm/templates/snippets/status/content_status.html:72
#: bookwyrm/templates/snippets/status/content_status.html:73
#: bookwyrm/templates/snippets/trimmed_text.html:17
msgid "Show more"
msgstr "Mehr anzeigen"
#: bookwyrm/templates/snippets/status/content_status.html:87
#: bookwyrm/templates/snippets/status/content_status.html:88
#: bookwyrm/templates/snippets/trimmed_text.html:34
msgid "Show less"
msgstr "Weniger anzeigen"
#: bookwyrm/templates/snippets/status/content_status.html:117
#: bookwyrm/templates/snippets/status/content_status.html:103
#, fuzzy, python-format
#| msgid "%(pages)s pages"
msgid "(Page %(page)s)"
msgstr "%(pages)s Seiten"
#: bookwyrm/templates/snippets/status/content_status.html:105
#, fuzzy, python-format
#| msgid "%(percent)s%% complete!"
msgid "(%(percent)s%%)"
msgstr "%(percent)s%% komplett!"
#: bookwyrm/templates/snippets/status/content_status.html:127
msgid "Open image in new window"
msgstr "Bild in neuem Fenster öffnen"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-05 21:43+0000\n"
"POT-Creation-Date: 2021-09-05 23: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"
@ -18,59 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: bookwyrm/forms.py:233
#: bookwyrm/forms.py:235
msgid "A user with this email already exists."
msgstr ""
#: bookwyrm/forms.py:247
#: bookwyrm/forms.py:249
msgid "One Day"
msgstr ""
#: bookwyrm/forms.py:248
#: bookwyrm/forms.py:250
msgid "One Week"
msgstr ""
#: bookwyrm/forms.py:249
#: bookwyrm/forms.py:251
msgid "One Month"
msgstr ""
#: bookwyrm/forms.py:250
#: bookwyrm/forms.py:252
msgid "Does Not Expire"
msgstr ""
#: bookwyrm/forms.py:255
#: bookwyrm/forms.py:257
#, python-format
msgid "%(count)d uses"
msgstr ""
#: bookwyrm/forms.py:258
#: bookwyrm/forms.py:260
msgid "Unlimited"
msgstr ""
#: bookwyrm/forms.py:308
#: bookwyrm/forms.py:310
msgid "List Order"
msgstr ""
#: bookwyrm/forms.py:309
#: bookwyrm/forms.py:311
msgid "Book Title"
msgstr ""
#: bookwyrm/forms.py:310
#: bookwyrm/templates/snippets/create_status/review.html:25
#: bookwyrm/forms.py:312
#: bookwyrm/templates/snippets/create_status/review.html:23
#: bookwyrm/templates/user/shelf/shelf.html:117
#: bookwyrm/templates/user/shelf/shelf.html:148
msgid "Rating"
msgstr ""
#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
msgid "Sort By"
msgstr ""
#: bookwyrm/forms.py:316
#: bookwyrm/forms.py:318
msgid "Ascending"
msgstr ""
#: bookwyrm/forms.py:317
#: bookwyrm/forms.py:319
msgid "Descending"
msgstr ""
@ -491,7 +491,7 @@ msgid "Back"
msgstr ""
#: bookwyrm/templates/book/edit_book.html:127
#: bookwyrm/templates/snippets/create_status/review.html:18
#: bookwyrm/templates/snippets/create_status/review.html:16
msgid "Title:"
msgstr ""
@ -2461,19 +2461,19 @@ msgstr ""
msgid "Progress:"
msgstr ""
#: bookwyrm/templates/snippets/create_status/comment.html:34
#: bookwyrm/templates/snippets/create_status/comment.html:47
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
#: bookwyrm/templates/snippets/readthrough_form.html:22
msgid "pages"
msgstr ""
#: bookwyrm/templates/snippets/create_status/comment.html:35
#: bookwyrm/templates/snippets/create_status/comment.html:53
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
#: bookwyrm/templates/snippets/readthrough_form.html:23
msgid "percent"
msgstr ""
#: bookwyrm/templates/snippets/create_status/comment.html:41
#: bookwyrm/templates/snippets/create_status/comment.html:60
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
#, python-format
msgid "of %(pages)s pages"
@ -2518,21 +2518,33 @@ msgstr ""
msgid "Post"
msgstr ""
#: bookwyrm/templates/snippets/create_status/quotation.html:19
#: bookwyrm/templates/snippets/create_status/quotation.html:17
msgid "Quote:"
msgstr ""
#: bookwyrm/templates/snippets/create_status/quotation.html:27
#: bookwyrm/templates/snippets/create_status/quotation.html:25
#, python-format
msgid "An excerpt from '%(book_title)s'"
msgstr ""
#: bookwyrm/templates/snippets/create_status/review.html:20
#: bookwyrm/templates/snippets/create_status/quotation.html:31
msgid "Position:"
msgstr ""
#: bookwyrm/templates/snippets/create_status/quotation.html:40
msgid "On page:"
msgstr ""
#: bookwyrm/templates/snippets/create_status/quotation.html:46
msgid "At percent:"
msgstr ""
#: bookwyrm/templates/snippets/create_status/review.html:18
#, python-format
msgid "Your review of '%(book_title)s'"
msgstr ""
#: bookwyrm/templates/snippets/create_status/review.html:32
#: bookwyrm/templates/snippets/create_status/review.html:30
msgid "Review:"
msgstr ""
@ -2805,17 +2817,27 @@ msgstr ""
msgid "Remove from %(name)s"
msgstr ""
#: bookwyrm/templates/snippets/status/content_status.html:72
#: bookwyrm/templates/snippets/status/content_status.html:73
#: bookwyrm/templates/snippets/trimmed_text.html:17
msgid "Show more"
msgstr ""
#: bookwyrm/templates/snippets/status/content_status.html:87
#: bookwyrm/templates/snippets/status/content_status.html:88
#: bookwyrm/templates/snippets/trimmed_text.html:34
msgid "Show less"
msgstr ""
#: bookwyrm/templates/snippets/status/content_status.html:117
#: bookwyrm/templates/snippets/status/content_status.html:103
#, python-format
msgid "(Page %(page)s)"
msgstr ""
#: bookwyrm/templates/snippets/status/content_status.html:105
#, python-format
msgid "(%(percent)s%%)"
msgstr ""
#: bookwyrm/templates/snippets/status/content_status.html:127
msgid "Open image in new window"
msgstr ""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-05 21:43+0000\n"
"POT-Creation-Date: 2021-09-05 23:09+0000\n"
"PO-Revision-Date: 2021-03-19 11:49+0800\n"
"Last-Translator: Reese Porter <reesedporter@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,59 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: bookwyrm/forms.py:233
#: bookwyrm/forms.py:235
msgid "A user with this email already exists."
msgstr "Ya existe un usuario con ese correo electrónico."
#: bookwyrm/forms.py:247
#: bookwyrm/forms.py:249
msgid "One Day"
msgstr "Un día"
#: bookwyrm/forms.py:248
#: bookwyrm/forms.py:250
msgid "One Week"
msgstr "Una semana"
#: bookwyrm/forms.py:249
#: bookwyrm/forms.py:251
msgid "One Month"
msgstr "Un mes"
#: bookwyrm/forms.py:250
#: bookwyrm/forms.py:252
msgid "Does Not Expire"
msgstr "Nunca se vence"
#: bookwyrm/forms.py:255
#: bookwyrm/forms.py:257
#, python-format
msgid "%(count)d uses"
msgstr "%(count)d usos"
#: bookwyrm/forms.py:258
#: bookwyrm/forms.py:260
msgid "Unlimited"
msgstr "Sin límite"
#: bookwyrm/forms.py:308
#: bookwyrm/forms.py:310
msgid "List Order"
msgstr "Orden de la lista"
#: bookwyrm/forms.py:309
#: bookwyrm/forms.py:311
msgid "Book Title"
msgstr "Título"
#: bookwyrm/forms.py:310
#: bookwyrm/templates/snippets/create_status/review.html:25
#: bookwyrm/forms.py:312
#: bookwyrm/templates/snippets/create_status/review.html:23
#: bookwyrm/templates/user/shelf/shelf.html:117
#: bookwyrm/templates/user/shelf/shelf.html:148
msgid "Rating"
msgstr "Calificación"
#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
msgid "Sort By"
msgstr "Ordenar por"
#: bookwyrm/forms.py:316
#: bookwyrm/forms.py:318
msgid "Ascending"
msgstr "Ascendente"
#: bookwyrm/forms.py:317
#: bookwyrm/forms.py:319
msgid "Descending"
msgstr "Descendente"
@ -491,7 +491,7 @@ msgid "Back"
msgstr "Volver"
#: bookwyrm/templates/book/edit_book.html:127
#: bookwyrm/templates/snippets/create_status/review.html:18
#: bookwyrm/templates/snippets/create_status/review.html:16
msgid "Title:"
msgstr "Título:"
@ -2461,19 +2461,19 @@ msgstr "Algunos pensamientos sobre el libro"
msgid "Progress:"
msgstr "Progreso:"
#: bookwyrm/templates/snippets/create_status/comment.html:34
#: bookwyrm/templates/snippets/create_status/comment.html:47
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
#: bookwyrm/templates/snippets/readthrough_form.html:22
msgid "pages"
msgstr "páginas"
#: bookwyrm/templates/snippets/create_status/comment.html:35
#: bookwyrm/templates/snippets/create_status/comment.html:53
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
#: bookwyrm/templates/snippets/readthrough_form.html:23
msgid "percent"
msgstr "por ciento"
#: bookwyrm/templates/snippets/create_status/comment.html:41
#: bookwyrm/templates/snippets/create_status/comment.html:60
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
#, python-format
msgid "of %(pages)s pages"
@ -2518,21 +2518,39 @@ msgstr "Privada"
msgid "Post"
msgstr "Compartir"
#: bookwyrm/templates/snippets/create_status/quotation.html:19
#: bookwyrm/templates/snippets/create_status/quotation.html:17
msgid "Quote:"
msgstr "Cita:"
#: bookwyrm/templates/snippets/create_status/quotation.html:27
#: bookwyrm/templates/snippets/create_status/quotation.html:25
#, python-format
msgid "An excerpt from '%(book_title)s'"
msgstr "Un extracto de '%(book_title)s'"
#: bookwyrm/templates/snippets/create_status/review.html:20
#: bookwyrm/templates/snippets/create_status/quotation.html:31
#, fuzzy
#| msgid "Description:"
msgid "Position:"
msgstr "Descripción:"
#: bookwyrm/templates/snippets/create_status/quotation.html:40
#, fuzzy
#| msgid "pages"
msgid "On page:"
msgstr "páginas"
#: bookwyrm/templates/snippets/create_status/quotation.html:46
#, fuzzy
#| msgid "percent"
msgid "At percent:"
msgstr "por ciento"
#: bookwyrm/templates/snippets/create_status/review.html:18
#, python-format
msgid "Your review of '%(book_title)s'"
msgstr "Tu reseña de '%(book_title)s'"
#: bookwyrm/templates/snippets/create_status/review.html:32
#: bookwyrm/templates/snippets/create_status/review.html:30
msgid "Review:"
msgstr "Reseña:"
@ -2805,17 +2823,29 @@ msgstr "Quiero leer"
msgid "Remove from %(name)s"
msgstr "Quitar de %(name)s"
#: bookwyrm/templates/snippets/status/content_status.html:72
#: bookwyrm/templates/snippets/status/content_status.html:73
#: bookwyrm/templates/snippets/trimmed_text.html:17
msgid "Show more"
msgstr "Mostrar más"
#: bookwyrm/templates/snippets/status/content_status.html:87
#: bookwyrm/templates/snippets/status/content_status.html:88
#: bookwyrm/templates/snippets/trimmed_text.html:34
msgid "Show less"
msgstr "Mostrar menos"
#: bookwyrm/templates/snippets/status/content_status.html:117
#: bookwyrm/templates/snippets/status/content_status.html:103
#, fuzzy, python-format
#| msgid "page %(page)s"
msgid "(Page %(page)s)"
msgstr "página %(page)s"
#: bookwyrm/templates/snippets/status/content_status.html:105
#, fuzzy, python-format
#| msgid "%(percent)s%% complete!"
msgid "(%(percent)s%%)"
msgstr "%(percent)s%% terminado!"
#: bookwyrm/templates/snippets/status/content_status.html:127
msgid "Open image in new window"
msgstr "Abrir imagen en una nueva ventana"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-05 21:43+0000\n"
"POT-Creation-Date: 2021-09-05 23:09+0000\n"
"PO-Revision-Date: 2021-04-05 12:44+0100\n"
"Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n"
@ -18,59 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: bookwyrm/forms.py:233
#: bookwyrm/forms.py:235
msgid "A user with this email already exists."
msgstr "Cet email est déjà associé à un compte."
#: bookwyrm/forms.py:247
#: bookwyrm/forms.py:249
msgid "One Day"
msgstr "Un jour"
#: bookwyrm/forms.py:248
#: bookwyrm/forms.py:250
msgid "One Week"
msgstr "Une semaine"
#: bookwyrm/forms.py:249
#: bookwyrm/forms.py:251
msgid "One Month"
msgstr "Un mois"
#: bookwyrm/forms.py:250
#: bookwyrm/forms.py:252
msgid "Does Not Expire"
msgstr "Sans expiration"
#: bookwyrm/forms.py:255
#: bookwyrm/forms.py:257
#, python-format
msgid "%(count)d uses"
msgstr "%(count)d utilisations"
#: bookwyrm/forms.py:258
#: bookwyrm/forms.py:260
msgid "Unlimited"
msgstr "Sans limite"
#: bookwyrm/forms.py:308
#: bookwyrm/forms.py:310
msgid "List Order"
msgstr "Ordre de la liste"
#: bookwyrm/forms.py:309
#: bookwyrm/forms.py:311
msgid "Book Title"
msgstr "Titre du livre"
#: bookwyrm/forms.py:310
#: bookwyrm/templates/snippets/create_status/review.html:25
#: bookwyrm/forms.py:312
#: bookwyrm/templates/snippets/create_status/review.html:23
#: bookwyrm/templates/user/shelf/shelf.html:117
#: bookwyrm/templates/user/shelf/shelf.html:148
msgid "Rating"
msgstr "Note"
#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
msgid "Sort By"
msgstr "Trier par"
#: bookwyrm/forms.py:316
#: bookwyrm/forms.py:318
msgid "Ascending"
msgstr "Ordre croissant"
#: bookwyrm/forms.py:317
#: bookwyrm/forms.py:319
msgid "Descending"
msgstr "Ordre décroissant"
@ -495,7 +495,7 @@ msgid "Back"
msgstr "Retour"
#: bookwyrm/templates/book/edit_book.html:127
#: bookwyrm/templates/snippets/create_status/review.html:18
#: bookwyrm/templates/snippets/create_status/review.html:16
msgid "Title:"
msgstr "Titre:"
@ -2494,19 +2494,19 @@ msgstr ""
msgid "Progress:"
msgstr "Progression:"
#: bookwyrm/templates/snippets/create_status/comment.html:34
#: bookwyrm/templates/snippets/create_status/comment.html:47
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
#: bookwyrm/templates/snippets/readthrough_form.html:22
msgid "pages"
msgstr "pages"
#: bookwyrm/templates/snippets/create_status/comment.html:35
#: bookwyrm/templates/snippets/create_status/comment.html:53
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
#: bookwyrm/templates/snippets/readthrough_form.html:23
msgid "percent"
msgstr "pourcent"
#: bookwyrm/templates/snippets/create_status/comment.html:41
#: bookwyrm/templates/snippets/create_status/comment.html:60
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
#, python-format
msgid "of %(pages)s pages"
@ -2551,23 +2551,41 @@ msgstr "Privé"
msgid "Post"
msgstr "Publier"
#: bookwyrm/templates/snippets/create_status/quotation.html:19
#: bookwyrm/templates/snippets/create_status/quotation.html:17
msgid "Quote:"
msgstr "Citation:"
#: bookwyrm/templates/snippets/create_status/quotation.html:27
#: bookwyrm/templates/snippets/create_status/quotation.html:25
#, fuzzy, python-format
#| msgid "Edit \"%(book_title)s\""
msgid "An excerpt from '%(book_title)s'"
msgstr "Modifier « %(book_title)s»"
#: bookwyrm/templates/snippets/create_status/review.html:20
#: bookwyrm/templates/snippets/create_status/quotation.html:31
#, fuzzy
#| msgid "Description:"
msgid "Position:"
msgstr "Description:"
#: bookwyrm/templates/snippets/create_status/quotation.html:40
#, fuzzy
#| msgid "pages"
msgid "On page:"
msgstr "pages"
#: bookwyrm/templates/snippets/create_status/quotation.html:46
#, fuzzy
#| msgid "percent"
msgid "At percent:"
msgstr "pourcent"
#: bookwyrm/templates/snippets/create_status/review.html:18
#, fuzzy, python-format
#| msgid "Editions of %(book_title)s"
msgid "Your review of '%(book_title)s'"
msgstr "Éditions de %(book_title)s"
#: bookwyrm/templates/snippets/create_status/review.html:32
#: bookwyrm/templates/snippets/create_status/review.html:30
msgid "Review:"
msgstr "Critique:"
@ -2844,17 +2862,29 @@ msgstr "Je veux le lire"
msgid "Remove from %(name)s"
msgstr "Retirer de %(name)s"
#: bookwyrm/templates/snippets/status/content_status.html:72
#: bookwyrm/templates/snippets/status/content_status.html:73
#: bookwyrm/templates/snippets/trimmed_text.html:17
msgid "Show more"
msgstr "Déplier"
#: bookwyrm/templates/snippets/status/content_status.html:87
#: bookwyrm/templates/snippets/status/content_status.html:88
#: bookwyrm/templates/snippets/trimmed_text.html:34
msgid "Show less"
msgstr "Replier"
#: bookwyrm/templates/snippets/status/content_status.html:117
#: bookwyrm/templates/snippets/status/content_status.html:103
#, fuzzy, python-format
#| msgid "page %(page)s"
msgid "(Page %(page)s)"
msgstr "page %(page)s"
#: bookwyrm/templates/snippets/status/content_status.html:105
#, fuzzy, python-format
#| msgid "%(percent)s%% complete!"
msgid "(%(percent)s%%)"
msgstr "%(percent)s%% terminé!"
#: bookwyrm/templates/snippets/status/content_status.html:127
msgid "Open image in new window"
msgstr "Ouvrir limage dans une nouvelle fenêtre"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-05 21:43+0000\n"
"POT-Creation-Date: 2021-09-05 23:09+0000\n"
"PO-Revision-Date: 2021-03-20 00:56+0000\n"
"Last-Translator: Kana <gudzpoz@live.com>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n"
@ -18,59 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: bookwyrm/forms.py:233
#: bookwyrm/forms.py:235
msgid "A user with this email already exists."
msgstr "已经存在使用该邮箱的用户。"
#: bookwyrm/forms.py:247
#: bookwyrm/forms.py:249
msgid "One Day"
msgstr "一天"
#: bookwyrm/forms.py:248
#: bookwyrm/forms.py:250
msgid "One Week"
msgstr "一周"
#: bookwyrm/forms.py:249
#: bookwyrm/forms.py:251
msgid "One Month"
msgstr "一个月"
#: bookwyrm/forms.py:250
#: bookwyrm/forms.py:252
msgid "Does Not Expire"
msgstr "永不失效"
#: bookwyrm/forms.py:255
#: bookwyrm/forms.py:257
#, python-format
msgid "%(count)d uses"
msgstr "%(count)d 次使用"
#: bookwyrm/forms.py:258
#: bookwyrm/forms.py:260
msgid "Unlimited"
msgstr "不受限"
#: bookwyrm/forms.py:308
#: bookwyrm/forms.py:310
msgid "List Order"
msgstr "列表顺序"
#: bookwyrm/forms.py:309
#: bookwyrm/forms.py:311
msgid "Book Title"
msgstr "书名"
#: bookwyrm/forms.py:310
#: bookwyrm/templates/snippets/create_status/review.html:25
#: bookwyrm/forms.py:312
#: bookwyrm/templates/snippets/create_status/review.html:23
#: bookwyrm/templates/user/shelf/shelf.html:117
#: bookwyrm/templates/user/shelf/shelf.html:148
msgid "Rating"
msgstr "评价"
#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
msgid "Sort By"
msgstr "排序方式"
#: bookwyrm/forms.py:316
#: bookwyrm/forms.py:318
msgid "Ascending"
msgstr "升序"
#: bookwyrm/forms.py:317
#: bookwyrm/forms.py:319
msgid "Descending"
msgstr "降序"
@ -490,7 +490,7 @@ msgid "Back"
msgstr "返回"
#: bookwyrm/templates/book/edit_book.html:127
#: bookwyrm/templates/snippets/create_status/review.html:18
#: bookwyrm/templates/snippets/create_status/review.html:16
msgid "Title:"
msgstr "标题:"
@ -2468,19 +2468,19 @@ msgstr "对书的一些看法"
msgid "Progress:"
msgstr "进度:"
#: bookwyrm/templates/snippets/create_status/comment.html:34
#: bookwyrm/templates/snippets/create_status/comment.html:47
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
#: bookwyrm/templates/snippets/readthrough_form.html:22
msgid "pages"
msgstr "页数"
#: bookwyrm/templates/snippets/create_status/comment.html:35
#: bookwyrm/templates/snippets/create_status/comment.html:53
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
#: bookwyrm/templates/snippets/readthrough_form.html:23
msgid "percent"
msgstr "百分比"
#: bookwyrm/templates/snippets/create_status/comment.html:41
#: bookwyrm/templates/snippets/create_status/comment.html:60
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
#, python-format
msgid "of %(pages)s pages"
@ -2525,21 +2525,39 @@ msgstr "私密"
msgid "Post"
msgstr "发布"
#: bookwyrm/templates/snippets/create_status/quotation.html:19
#: bookwyrm/templates/snippets/create_status/quotation.html:17
msgid "Quote:"
msgstr "引用:"
#: bookwyrm/templates/snippets/create_status/quotation.html:27
#: bookwyrm/templates/snippets/create_status/quotation.html:25
#, python-format
msgid "An excerpt from '%(book_title)s'"
msgstr "摘自《%(book_title)s》的节录"
#: bookwyrm/templates/snippets/create_status/review.html:20
#: bookwyrm/templates/snippets/create_status/quotation.html:31
#, fuzzy
#| msgid "Description:"
msgid "Position:"
msgstr "描述:"
#: bookwyrm/templates/snippets/create_status/quotation.html:40
#, fuzzy
#| msgid "pages"
msgid "On page:"
msgstr "页数"
#: bookwyrm/templates/snippets/create_status/quotation.html:46
#, fuzzy
#| msgid "percent"
msgid "At percent:"
msgstr "百分比"
#: bookwyrm/templates/snippets/create_status/review.html:18
#, python-format
msgid "Your review of '%(book_title)s'"
msgstr "你对《%(book_title)s》的书评"
#: bookwyrm/templates/snippets/create_status/review.html:32
#: bookwyrm/templates/snippets/create_status/review.html:30
msgid "Review:"
msgstr "书评:"
@ -2808,17 +2826,29 @@ msgstr "想要阅读"
msgid "Remove from %(name)s"
msgstr "从 %(name)s 移除"
#: bookwyrm/templates/snippets/status/content_status.html:72
#: bookwyrm/templates/snippets/status/content_status.html:73
#: bookwyrm/templates/snippets/trimmed_text.html:17
msgid "Show more"
msgstr "显示更多"
#: bookwyrm/templates/snippets/status/content_status.html:87
#: bookwyrm/templates/snippets/status/content_status.html:88
#: bookwyrm/templates/snippets/trimmed_text.html:34
msgid "Show less"
msgstr "显示更少"
#: bookwyrm/templates/snippets/status/content_status.html:117
#: bookwyrm/templates/snippets/status/content_status.html:103
#, fuzzy, python-format
#| msgid "page %(page)s"
msgid "(Page %(page)s)"
msgstr "第 %(page)s 页"
#: bookwyrm/templates/snippets/status/content_status.html:105
#, fuzzy, python-format
#| msgid "%(percent)s%% complete!"
msgid "(%(percent)s%%)"
msgstr "完成了 %(percent)s%% "
#: bookwyrm/templates/snippets/status/content_status.html:127
msgid "Open image in new window"
msgstr "在新窗口中打开图像"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-05 21:43+0000\n"
"POT-Creation-Date: 2021-09-05 23:09+0000\n"
"PO-Revision-Date: 2021-06-30 10:36+0000\n"
"Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,59 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: bookwyrm/forms.py:233
#: bookwyrm/forms.py:235
msgid "A user with this email already exists."
msgstr "已經存在使用該郵箱的使用者。"
#: bookwyrm/forms.py:247
#: bookwyrm/forms.py:249
msgid "One Day"
msgstr "一天"
#: bookwyrm/forms.py:248
#: bookwyrm/forms.py:250
msgid "One Week"
msgstr "一週"
#: bookwyrm/forms.py:249
#: bookwyrm/forms.py:251
msgid "One Month"
msgstr "一個月"
#: bookwyrm/forms.py:250
#: bookwyrm/forms.py:252
msgid "Does Not Expire"
msgstr "永不失效"
#: bookwyrm/forms.py:255
#: bookwyrm/forms.py:257
#, python-format
msgid "%(count)d uses"
msgstr "%(count)d 次使用"
#: bookwyrm/forms.py:258
#: bookwyrm/forms.py:260
msgid "Unlimited"
msgstr "不受限"
#: bookwyrm/forms.py:308
#: bookwyrm/forms.py:310
msgid "List Order"
msgstr "列表順序"
#: bookwyrm/forms.py:309
#: bookwyrm/forms.py:311
msgid "Book Title"
msgstr "書名"
#: bookwyrm/forms.py:310
#: bookwyrm/templates/snippets/create_status/review.html:25
#: bookwyrm/forms.py:312
#: bookwyrm/templates/snippets/create_status/review.html:23
#: bookwyrm/templates/user/shelf/shelf.html:117
#: bookwyrm/templates/user/shelf/shelf.html:148
msgid "Rating"
msgstr "評價"
#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107
msgid "Sort By"
msgstr "排序方式"
#: bookwyrm/forms.py:316
#: bookwyrm/forms.py:318
msgid "Ascending"
msgstr "升序"
#: bookwyrm/forms.py:317
#: bookwyrm/forms.py:319
msgid "Descending"
msgstr "降序"
@ -496,7 +496,7 @@ msgid "Back"
msgstr "返回"
#: bookwyrm/templates/book/edit_book.html:127
#: bookwyrm/templates/snippets/create_status/review.html:18
#: bookwyrm/templates/snippets/create_status/review.html:16
msgid "Title:"
msgstr "標題:"
@ -2508,19 +2508,19 @@ msgstr ""
msgid "Progress:"
msgstr "進度:"
#: bookwyrm/templates/snippets/create_status/comment.html:34
#: bookwyrm/templates/snippets/create_status/comment.html:47
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
#: bookwyrm/templates/snippets/readthrough_form.html:22
msgid "pages"
msgstr "頁數"
#: bookwyrm/templates/snippets/create_status/comment.html:35
#: bookwyrm/templates/snippets/create_status/comment.html:53
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
#: bookwyrm/templates/snippets/readthrough_form.html:23
msgid "percent"
msgstr "百分比"
#: bookwyrm/templates/snippets/create_status/comment.html:41
#: bookwyrm/templates/snippets/create_status/comment.html:60
#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
#, python-format
msgid "of %(pages)s pages"
@ -2565,23 +2565,41 @@ msgstr "私密"
msgid "Post"
msgstr "釋出"
#: bookwyrm/templates/snippets/create_status/quotation.html:19
#: bookwyrm/templates/snippets/create_status/quotation.html:17
msgid "Quote:"
msgstr "引用:"
#: bookwyrm/templates/snippets/create_status/quotation.html:27
#: bookwyrm/templates/snippets/create_status/quotation.html:25
#, fuzzy, python-format
#| msgid "Edit \"%(book_title)s\""
msgid "An excerpt from '%(book_title)s'"
msgstr "編輯 \"%(book_title)s\""
#: bookwyrm/templates/snippets/create_status/review.html:20
#: bookwyrm/templates/snippets/create_status/quotation.html:31
#, fuzzy
#| msgid "Description:"
msgid "Position:"
msgstr "描述:"
#: bookwyrm/templates/snippets/create_status/quotation.html:40
#, fuzzy
#| msgid "pages"
msgid "On page:"
msgstr "頁數"
#: bookwyrm/templates/snippets/create_status/quotation.html:46
#, fuzzy
#| msgid "percent"
msgid "At percent:"
msgstr "百分比"
#: bookwyrm/templates/snippets/create_status/review.html:18
#, fuzzy, python-format
#| msgid "Editions of %(book_title)s"
msgid "Your review of '%(book_title)s'"
msgstr "%(book_title)s 的各版本"
#: bookwyrm/templates/snippets/create_status/review.html:32
#: bookwyrm/templates/snippets/create_status/review.html:30
msgid "Review:"
msgstr "書評:"
@ -2854,17 +2872,29 @@ msgstr "想要閱讀"
msgid "Remove from %(name)s"
msgstr "從 %(name)s 移除"
#: bookwyrm/templates/snippets/status/content_status.html:72
#: bookwyrm/templates/snippets/status/content_status.html:73
#: bookwyrm/templates/snippets/trimmed_text.html:17
msgid "Show more"
msgstr "顯示更多"
#: bookwyrm/templates/snippets/status/content_status.html:87
#: bookwyrm/templates/snippets/status/content_status.html:88
#: bookwyrm/templates/snippets/trimmed_text.html:34
msgid "Show less"
msgstr "顯示更少"
#: bookwyrm/templates/snippets/status/content_status.html:117
#: bookwyrm/templates/snippets/status/content_status.html:103
#, fuzzy, python-format
#| msgid "page %(page)s"
msgid "(Page %(page)s)"
msgstr "第 %(page)s 頁"
#: bookwyrm/templates/snippets/status/content_status.html:105
#, fuzzy, python-format
#| msgid "%(percent)s%% complete!"
msgid "(%(percent)s%%)"
msgstr "完成了 %(percent)s%% "
#: bookwyrm/templates/snippets/status/content_status.html:127
msgid "Open image in new window"
msgstr "在新視窗中開啟圖片"