From 6b3447761f2f27c1c2d09a545fff1edbb6421ec4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 20 May 2021 18:16:35 -0700 Subject: [PATCH 01/16] Adds book format field with choices --- ...l_format_edition_physical_format_detail.py | 35 +++++++++++++++++++ bookwyrm/models/book.py | 12 ++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py diff --git a/bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py new file mode 100644 index 00000000..05ad1a2b --- /dev/null +++ b/bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py @@ -0,0 +1,35 @@ +# Generated by Django 3.2 on 2021-05-21 00:17 + +from django.db import migrations +import bookwyrm + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0075_announcement"), + ] + + operations = [ + migrations.RenameField( + model_name="edition", + old_name="physical_format", + new_name="physical_format_detail", + ), + migrations.AddField( + model_name="edition", + name="physical_format", + field=bookwyrm.models.fields.CharField( + blank=True, + choices=[ + ("AudiobookFormat", "Audiobookformat"), + ("EBook", "Ebook"), + ("GraphicNovel", "Graphicnovel"), + ("Hardcover", "Hardcover"), + ("Paperback", "Paperback"), + ], + max_length=255, + null=True, + ), + ), + ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 869ff04d..ae79223d 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -169,6 +169,13 @@ class Work(OrderedCollectionPageMixin, Book): deserialize_reverse_fields = [("editions", "editions")] +# https://schema.org/BookFormatType +FormatChoices = models.TextChoices( + "FormatChoices", + "AudiobookFormat EBook GraphicNovel Hardcover Paperback", +) + + class Edition(Book): """an edition of a book""" @@ -186,7 +193,10 @@ class Edition(Book): max_length=255, blank=True, null=True, deduplication_field=True ) pages = fields.IntegerField(blank=True, null=True) - physical_format = fields.CharField(max_length=255, blank=True, null=True) + physical_format = fields.CharField( + max_length=255, choices=FormatChoices.choices, null=True, blank=True + ) + physical_format_detail = fields.CharField(max_length=255, blank=True, null=True) publishers = fields.ArrayField( models.CharField(max_length=255), blank=True, default=list ) From e99e4831f13cf01cec8b418473da1c3d7ee7d695 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Jun 2021 08:17:27 -0700 Subject: [PATCH 02/16] Updates migration --- ...l_format_edition_physical_format_detail.py | 35 ------ ...l_format_edition_physical_format_detail.py | 100 ++++++++++++++++++ 2 files changed, 100 insertions(+), 35 deletions(-) delete mode 100644 bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py create mode 100644 bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py diff --git a/bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py deleted file mode 100644 index 05ad1a2b..00000000 --- a/bookwyrm/migrations/0076_rename_physical_format_edition_physical_format_detail.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 3.2 on 2021-05-21 00:17 - -from django.db import migrations -import bookwyrm - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0075_announcement"), - ] - - operations = [ - migrations.RenameField( - model_name="edition", - old_name="physical_format", - new_name="physical_format_detail", - ), - migrations.AddField( - model_name="edition", - name="physical_format", - field=bookwyrm.models.fields.CharField( - blank=True, - choices=[ - ("AudiobookFormat", "Audiobookformat"), - ("EBook", "Ebook"), - ("GraphicNovel", "Graphicnovel"), - ("Hardcover", "Hardcover"), - ("Paperback", "Paperback"), - ], - max_length=255, - null=True, - ), - ), - ] diff --git a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py new file mode 100644 index 00000000..ab152252 --- /dev/null +++ b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py @@ -0,0 +1,100 @@ +# Generated by Django 3.2 on 2021-05-21 00:17 + +from django.db import migrations +import bookwyrm + + +def infer_format(app_registry, schema_editor): + """set the new phsyical format field based on existing format data""" + db_alias = schema_editor.connection.alias + + editions = ( + app_registry.get_model("bookwyrm", "Edition") + .objects.using(db_alias) + .filter(physical_format__isnull=False) + ) + mappings = { + "paperback": "Paperback", + "soft": "Paperback", + "pamphlet": "Paperback", + "peperback": "Paperback", + "tapa blanda": "Paperback", + "turtleback": "Paperback", + "pocket": "Paperback", + "spiral": "Paperback", + "ring": "Paperback", + "平装": "Paperback", + "简装": "Paperback", + "hardcover": "Hardcover", + "hardcocer": "Hardcover", + "hardover": "Hardcover", + "hardback": "Hardcover", + "library": "Hardcover", + "tapa dura": "Hardcover", + "leather": "Hardcover", + "clothbound": "Hardcover", + "精装": "Hardcover", + "ebook": "EBook", + "e-book": "EBook", + "digital": "EBook", + "computer file": "EBook", + "epub": "EBook", + "online": "EBook", + "pdf": "EBook", + "elektronische": "EBook", + "electronic": "EBook", + "audiobook": "AudiobookFormat", + "audio": "AudiobookFormat", + "cd": "AudiobookFormat", + "dvd": "AudiobookFormat", + "mp3": "AudiobookFormat", + "cassette": "AudiobookFormat", + "kindle": "AudiobookFormat", + "talking": "AudiobookFormat", + "sound": "AudiobookFormat", + "comic": "GraphicNovel", + "graphic": "GraphicNovel", + } + for edition in editions: + free_format = editions.physical_format_detail.lower() + if free_format in mappings: + edition.physical_format = mappings[free_format] + edition.save(broadcast=False) + else: + matches = [v for k, v in mappings if k in free_format] + if not matches: + continue + edition.physical_format = matches[0] + edition.save(broadcast=False) + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0076_preview_images"), + ] + + operations = [ + migrations.RenameField( + model_name="edition", + old_name="physical_format", + new_name="physical_format_detail", + ), + migrations.AddField( + model_name="edition", + name="physical_format", + field=bookwyrm.models.fields.CharField( + blank=True, + choices=[ + ("AudiobookFormat", "Audiobookformat"), + ("EBook", "Ebook"), + ("GraphicNovel", "Graphicnovel"), + ("Hardcover", "Hardcover"), + ("Paperback", "Paperback"), + ], + max_length=255, + null=True, + ), + ), + migrations.RunPython(infer_format), + ] From cb811c92a668e2e6766542edebf4565dd084c952 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Jun 2021 08:36:12 -0700 Subject: [PATCH 03/16] Adds reverse migration stub --- ...ename_physical_format_edition_physical_format_detail.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py index ab152252..eec94d62 100644 --- a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py +++ b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py @@ -57,16 +57,21 @@ def infer_format(app_registry, schema_editor): } for edition in editions: free_format = editions.physical_format_detail.lower() + print(free_format) if free_format in mappings: + print("hi") edition.physical_format = mappings[free_format] edition.save(broadcast=False) else: matches = [v for k, v in mappings if k in free_format] + print(matches) if not matches: continue edition.physical_format = matches[0] edition.save(broadcast=False) +def reverse(app_registry, schema_editor): + """doesn't need to do anything""" class Migration(migrations.Migration): @@ -96,5 +101,5 @@ class Migration(migrations.Migration): null=True, ), ), - migrations.RunPython(infer_format), + migrations.RunPython(infer_format, reverse), ] From f82161d648cb06f57cabc57f45f13ac99f4f43fd Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Jun 2021 08:37:53 -0700 Subject: [PATCH 04/16] Fixes migration query --- ...hysical_format_edition_physical_format_detail.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py index eec94d62..020cc49a 100644 --- a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py +++ b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py @@ -11,7 +11,7 @@ def infer_format(app_registry, schema_editor): editions = ( app_registry.get_model("bookwyrm", "Edition") .objects.using(db_alias) - .filter(physical_format__isnull=False) + .filter(physical_format_detail__isnull=False) ) mappings = { "paperback": "Paperback", @@ -56,19 +56,16 @@ def infer_format(app_registry, schema_editor): "graphic": "GraphicNovel", } for edition in editions: - free_format = editions.physical_format_detail.lower() - print(free_format) + free_format = edition.physical_format_detail.lower() if free_format in mappings: - print("hi") edition.physical_format = mappings[free_format] - edition.save(broadcast=False) + edition.save() else: - matches = [v for k, v in mappings if k in free_format] - print(matches) + matches = [v for k, v in mappings.items() if k in free_format] if not matches: continue edition.physical_format = matches[0] - edition.save(broadcast=False) + edition.save() def reverse(app_registry, schema_editor): """doesn't need to do anything""" From 48fcdcbe93a6171ef249e22726ad4ae0e56ea80c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 4 Aug 2021 14:12:37 -0700 Subject: [PATCH 05/16] Python formatting --- ...077_rename_physical_format_edition_physical_format_detail.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py index 020cc49a..fcff9352 100644 --- a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py +++ b/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py @@ -67,9 +67,11 @@ def infer_format(app_registry, schema_editor): edition.physical_format = matches[0] edition.save() + def reverse(app_registry, schema_editor): """doesn't need to do anything""" + class Migration(migrations.Migration): dependencies = [ From 2c08be79f86f11f103d09645eebe02b8d10c6111 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 4 Aug 2021 14:19:17 -0700 Subject: [PATCH 06/16] Merge migration --- bookwyrm/migrations/0080_merge_20210804_2114.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0080_merge_20210804_2114.py diff --git a/bookwyrm/migrations/0080_merge_20210804_2114.py b/bookwyrm/migrations/0080_merge_20210804_2114.py new file mode 100644 index 00000000..d8365eaf --- /dev/null +++ b/bookwyrm/migrations/0080_merge_20210804_2114.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.4 on 2021-08-04 21:14 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0077_rename_physical_format_edition_physical_format_detail"), + ("bookwyrm", "0079_merge_20210804_1746"), + ] + + operations = [] From f80503d9471c1b22db8027c4feea329b9511797d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 6 Sep 2021 22:15:13 -0700 Subject: [PATCH 07/16] Merge migration --- bookwyrm/migrations/0089_merge_20210907_0514.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0089_merge_20210907_0514.py diff --git a/bookwyrm/migrations/0089_merge_20210907_0514.py b/bookwyrm/migrations/0089_merge_20210907_0514.py new file mode 100644 index 00000000..86d29599 --- /dev/null +++ b/bookwyrm/migrations/0089_merge_20210907_0514.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.4 on 2021-09-07 05:14 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0080_merge_20210804_2114"), + ("bookwyrm", "0088_auto_20210905_2233"), + ] + + operations = [] From 8a748fa67582fba91d2dd2efad366592a145cc77 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Sep 2021 09:22:15 -0700 Subject: [PATCH 08/16] Adds format fields to edit book view --- .../0090_alter_edition_physical_format.py | 30 +++ bookwyrm/models/book.py | 14 +- bookwyrm/templates/book/edit_book.html | 27 ++- locale/de_DE/LC_MESSAGES/django.po | 209 ++++++++++++----- locale/en_US/LC_MESSAGES/django.po | 172 ++++++++++---- locale/es/LC_MESSAGES/django.po | 211 ++++++++++++----- locale/fr_FR/LC_MESSAGES/django.po | 213 +++++++++++++----- locale/zh_Hans/LC_MESSAGES/django.po | 201 +++++++++++++---- locale/zh_Hant/LC_MESSAGES/django.po | 201 +++++++++++++---- 9 files changed, 954 insertions(+), 324 deletions(-) create mode 100644 bookwyrm/migrations/0090_alter_edition_physical_format.py diff --git a/bookwyrm/migrations/0090_alter_edition_physical_format.py b/bookwyrm/migrations/0090_alter_edition_physical_format.py new file mode 100644 index 00000000..b37a75a6 --- /dev/null +++ b/bookwyrm/migrations/0090_alter_edition_physical_format.py @@ -0,0 +1,30 @@ +# Generated by Django 3.2.4 on 2021-09-07 19:46 + +import bookwyrm.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0089_merge_20210907_0514"), + ] + + operations = [ + migrations.AlterField( + model_name="edition", + name="physical_format", + field=bookwyrm.models.fields.CharField( + blank=True, + choices=[ + ("AudiobookFormat", "Audiobook"), + ("EBook", "eBook"), + ("GraphicNovel", "Graphic novel"), + ("Hardcover", "Hardcover"), + ("Paperback", "Paperback"), + ], + max_length=255, + null=True, + ), + ), + ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index e21d61e2..5888ea07 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -5,6 +5,7 @@ from django.contrib.postgres.search import SearchVectorField from django.contrib.postgres.indexes import GinIndex from django.db import models from django.dispatch import receiver +from django.utils.translation import gettext_lazy as _ from model_utils import FieldTracker from model_utils.managers import InheritanceManager from imagekit.models import ImageSpecField @@ -225,10 +226,13 @@ class Work(OrderedCollectionPageMixin, Book): # https://schema.org/BookFormatType -FormatChoices = models.TextChoices( - "FormatChoices", - "AudiobookFormat EBook GraphicNovel Hardcover Paperback", -) +FormatChoices = [ + ("AudiobookFormat", _("Audiobook")), + ("EBook", _("eBook")), + ("GraphicNovel", _("Graphic novel")), + ("Hardcover", _("Hardcover")), + ("Paperback", _("Paperback")), +] class Edition(Book): @@ -249,7 +253,7 @@ class Edition(Book): ) pages = fields.IntegerField(blank=True, null=True) physical_format = fields.CharField( - max_length=255, choices=FormatChoices.choices, null=True, blank=True + max_length=255, choices=FormatChoices, null=True, blank=True ) physical_format_detail = fields.CharField(max_length=255, blank=True, null=True) publishers = fields.ArrayField( diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html index 2f6ca324..ebfeccf5 100644 --- a/bookwyrm/templates/book/edit_book.html +++ b/bookwyrm/templates/book/edit_book.html @@ -253,12 +253,27 @@

{% trans "Physical Properties" %}

-
- - {{ form.physical_format }} - {% for error in form.physical_format.errors %} -

{{ error | escape }}

- {% endfor %} +
+
+
+ +
+ {{ form.physical_format }} +
+ {% for error in form.physical_format.errors %} +

{{ error | escape }}

+ {% endfor %} +
+
+
+
+ + {{ form.physical_format_detail }} + {% for error in form.physical_format_detail.errors %} +

{{ error | escape }}

+ {% endfor %} +
+
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index b3623765..49b1b4b2 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-07 16:12+0000\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,67 +18,93 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:195 +#, fuzzy +#| msgid "Add Books" +msgid "Audiobook" +msgstr "Bücher hinzufügen" + +#: bookwyrm/forms.py:196 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "Buch" + +#: bookwyrm/forms.py:197 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/forms.py:198 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "Cover hinzufügen" + +#: bookwyrm/forms.py:199 +msgid "Paperback" +msgstr "" + +#: bookwyrm/forms.py:246 #, 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:249 +#: bookwyrm/forms.py:260 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:261 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:251 +#: bookwyrm/forms.py:262 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:252 +#: bookwyrm/forms.py:263 msgid "Does Not Expire" msgstr "Läuft nicht aus" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:268 #, python-format msgid "%(count)d uses" msgstr "%(count)d Benutzungen" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:271 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" msgstr "Ungelistet" -#: bookwyrm/forms.py:310 +#: bookwyrm/forms.py:321 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:311 +#: bookwyrm/forms.py:322 #, fuzzy #| msgid "Title" msgid "Book Title" msgstr "Titel" -#: bookwyrm/forms.py:312 +#: bookwyrm/forms.py:323 #: 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:314 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:325 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:318 +#: bookwyrm/forms.py:329 #, fuzzy #| msgid "Started reading" msgid "Ascending" msgstr "Zu lesen angefangen" -#: bookwyrm/forms.py:319 +#: bookwyrm/forms.py:330 #, fuzzy #| msgid "Started reading" msgid "Descending" @@ -284,7 +310,7 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:89 -#: bookwyrm/templates/book/edit_book.html:300 +#: bookwyrm/templates/book/edit_book.html:315 #, fuzzy #| msgid "View on OpenLibrary" msgid "Inventaire ID:" @@ -300,10 +326,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:140 -#: bookwyrm/templates/book/edit_book.html:328 +#: bookwyrm/templates/book/edit_book.html:343 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -318,8 +344,9 @@ msgstr "Speichern" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:329 +#: bookwyrm/templates/book/edit_book.html:344 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -458,12 +485,12 @@ msgid "ISBN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:308 +#: bookwyrm/templates/book/edit_book.html:323 msgid "OCLC Number:" msgstr "OCLC Nummer:" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:316 +#: bookwyrm/templates/book/edit_book.html:331 msgid "ASIN:" msgstr "" @@ -609,28 +636,32 @@ msgstr "" msgid "Physical Properties" msgstr "Physikalische Eigenschaften" -#: bookwyrm/templates/book/edit_book.html:257 +#: bookwyrm/templates/book/edit_book.html:259 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:265 +#: bookwyrm/templates/book/edit_book.html:270 +msgid "Format details:" +msgstr "" + +#: bookwyrm/templates/book/edit_book.html:280 msgid "Pages:" msgstr "Seiten:" -#: bookwyrm/templates/book/edit_book.html:274 +#: bookwyrm/templates/book/edit_book.html:289 msgid "Book Identifiers" msgstr "Buchidentifikatoren" -#: bookwyrm/templates/book/edit_book.html:276 +#: bookwyrm/templates/book/edit_book.html:291 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:284 +#: bookwyrm/templates/book/edit_book.html:299 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:292 +#: bookwyrm/templates/book/edit_book.html:307 msgid "Openlibrary ID:" msgstr "" @@ -766,6 +797,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 #, fuzzy #| msgid "Confirm password:" msgid "Confirmation code:" @@ -1605,8 +1637,27 @@ msgstr "Bestätigen" msgid "Discard" msgstr "Ablehnen" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "Dieses Fortschrittsupdate löschen" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#, fuzzy +#| msgid "This shelf is empty." +msgid "This action cannot be un-done" +msgstr "Dieses Regal ist leer." + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "Löschen" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "Liste bearbeiten" @@ -1641,6 +1692,12 @@ msgstr "Offen" msgid "Anyone can add books to this list" msgstr "Alle können Bücher hinzufügen" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "Post löschen" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "" @@ -2070,6 +2127,7 @@ msgid "Account" msgstr "" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "Profil" @@ -2208,12 +2266,6 @@ msgstr "Zurück zu den Meldungen" msgid "Edit Announcement" msgstr "Ankündigungen" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "Löschen" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "" @@ -2280,6 +2332,7 @@ msgstr "Lesedaten bearbeiten" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "" @@ -2329,7 +2382,7 @@ msgstr "Instanzname" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 #, fuzzy #| msgid "Import Status" msgid "Status:" @@ -2348,13 +2401,13 @@ msgstr "Blockierte Nutzer*innen" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 #, fuzzy #| msgid "Description:" msgid "Version:" @@ -2383,6 +2436,7 @@ msgid "View all" msgstr "" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 #, fuzzy #| msgid "Recent Imports" msgid "Reports:" @@ -2407,7 +2461,7 @@ msgid "Blocked by us:" msgstr "Blockierte Nutzer*innen" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "" @@ -3428,7 +3482,7 @@ msgstr[1] "folgt dir" msgid "No followers you follow" msgstr "folgt dir" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 #, fuzzy #| msgid "Back to reports" msgid "Back to users" @@ -3464,37 +3518,89 @@ msgid "Remote instance" msgstr "Instanzname" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 #, fuzzy #| msgid "Activity" msgid "Active" msgstr "Aktivität" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 #, fuzzy #| msgid "User Profile" msgid "View user profile" msgstr "Benutzerprofil" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "Lokal" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "Entfernen" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email address:" +msgid "Email:" +msgstr "E-Mail Adresse" + +#: bookwyrm/templates/user_admin/user_info.html:64 +msgid "(View reports)" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked Users" +msgid "Blocked by count:" +msgstr "Blockierte Nutzer*innen" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "Birth date:" +msgid "Last active date:" +msgstr "Geburtsdatum:" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "Folgende manuell bestätigen" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discard" +msgid "Discoverable:" +msgstr "Ablehnen" + +#: bookwyrm/templates/user_admin/user_info.html:93 +#, fuzzy +#| msgid "Deactivate user" +msgid "Deactivation reason:" +msgstr "Nutzer:in deaktivieren" + +#: bookwyrm/templates/user_admin/user_info.html:111 #, fuzzy #| msgid "Instance Settings" msgid "Instance details" msgstr "Instanzeinstellungen" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "" @@ -3560,9 +3666,6 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "Föderierende Server" -#~ msgid "Local" -#~ msgstr "Lokal" - #, fuzzy #~| msgid "Lists: %(username)s" #~ msgid "Reports: %(server_name)s" @@ -3639,11 +3742,6 @@ msgstr "" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "%(value)s ist keine gültige remote_id" -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "This field cannot be null." -#~ msgstr "Dieses Regal ist leer." - #, fuzzy #~| msgid "A user with that username already exists." #~ msgid "%(model_name)s with this %(field_label)s already exists." @@ -3873,9 +3971,6 @@ msgstr "" #~ msgid "by %(author)s" #~ msgstr "von %(author)s" -#~ msgid "Deactivate user" -#~ msgstr "Nutzer:in deaktivieren" - #~ msgid "Reactivate user" #~ msgstr "Nutzer:in reaktivieren" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 5fb90611..637853e2 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.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-07 16:12+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,59 +18,79 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:195 +msgid "Audiobook" +msgstr "" + +#: bookwyrm/forms.py:196 +msgid "eBook" +msgstr "" + +#: bookwyrm/forms.py:197 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/forms.py:198 +msgid "Hardcover" +msgstr "" + +#: bookwyrm/forms.py:199 +msgid "Paperback" +msgstr "" + +#: bookwyrm/forms.py:246 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:260 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:261 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:251 +#: bookwyrm/forms.py:262 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:252 +#: bookwyrm/forms.py:263 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:268 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:271 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:310 +#: bookwyrm/forms.py:321 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:311 +#: bookwyrm/forms.py:322 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:312 +#: bookwyrm/forms.py:323 #: 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:314 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:325 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:318 +#: bookwyrm/forms.py:329 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:319 +#: bookwyrm/forms.py:330 msgid "Descending" msgstr "" @@ -262,7 +282,7 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:89 -#: bookwyrm/templates/book/edit_book.html:300 +#: bookwyrm/templates/book/edit_book.html:315 msgid "Inventaire ID:" msgstr "" @@ -276,10 +296,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:140 -#: bookwyrm/templates/book/edit_book.html:328 +#: bookwyrm/templates/book/edit_book.html:343 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -294,8 +314,9 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:329 +#: bookwyrm/templates/book/edit_book.html:344 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -419,12 +440,12 @@ msgid "ISBN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:308 +#: bookwyrm/templates/book/edit_book.html:323 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:316 +#: bookwyrm/templates/book/edit_book.html:331 msgid "ASIN:" msgstr "" @@ -554,28 +575,32 @@ msgstr "" msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit_book.html:257 +#: bookwyrm/templates/book/edit_book.html:259 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:265 +#: bookwyrm/templates/book/edit_book.html:270 +msgid "Format details:" +msgstr "" + +#: bookwyrm/templates/book/edit_book.html:280 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:274 +#: bookwyrm/templates/book/edit_book.html:289 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit_book.html:276 +#: bookwyrm/templates/book/edit_book.html:291 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:284 +#: bookwyrm/templates/book/edit_book.html:299 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit_book.html:292 +#: bookwyrm/templates/book/edit_book.html:307 msgid "Openlibrary ID:" msgstr "" @@ -701,6 +726,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "" @@ -1476,8 +1502,23 @@ msgstr "" msgid "Discard" msgstr "" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +msgid "Delete this list?" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "" @@ -1512,6 +1553,10 @@ msgstr "" msgid "Anyone can add books to this list" msgstr "" +#: bookwyrm/templates/lists/form.html:49 +msgid "Delete list" +msgstr "" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "" @@ -1901,6 +1946,7 @@ msgid "Account" msgstr "" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "" @@ -2021,12 +2067,6 @@ msgstr "" msgid "Edit Announcement" msgstr "" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "" @@ -2077,6 +2117,7 @@ msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "" @@ -2114,7 +2155,7 @@ msgstr "" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "" @@ -2129,13 +2170,13 @@ msgstr "" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "" @@ -2162,6 +2203,7 @@ msgid "View all" msgstr "" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "" @@ -2178,7 +2220,7 @@ msgid "Blocked by us:" msgstr "" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "" @@ -3100,7 +3142,7 @@ msgstr[1] "" msgid "No followers you follow" msgstr "" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "" @@ -3127,31 +3169,69 @@ msgid "Remote instance" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:38 +msgid "Remote" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:52 +msgid "Email:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:64 +msgid "(View reports)" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:72 +msgid "Blocked by count:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:77 +msgid "Last active date:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:82 +msgid "Manually approved followers:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:87 +msgid "Discoverable:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:93 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 48e8e8ce..12c4fb35 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-07 16:12+0000\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: Reese Porter \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,85 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:195 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "Agregar libros" + +#: bookwyrm/forms.py:196 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "Libro" + +#: bookwyrm/forms.py:197 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/forms.py:198 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "Agregar portada" + +#: bookwyrm/forms.py:199 +msgid "Paperback" +msgstr "" + +#: bookwyrm/forms.py:246 msgid "A user with this email already exists." msgstr "Ya existe un usuario con ese correo electrónico." -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:260 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:261 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:251 +#: bookwyrm/forms.py:262 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:252 +#: bookwyrm/forms.py:263 msgid "Does Not Expire" msgstr "Nunca se vence" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:268 #, python-format msgid "%(count)d uses" msgstr "%(count)d usos" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:271 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:310 +#: bookwyrm/forms.py:321 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:311 +#: bookwyrm/forms.py:322 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:312 +#: bookwyrm/forms.py:323 #: 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:314 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:325 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:318 +#: bookwyrm/forms.py:329 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:319 +#: bookwyrm/forms.py:330 msgid "Descending" msgstr "Descendente" @@ -262,7 +288,7 @@ msgid "Openlibrary key:" msgstr "Clave OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:89 -#: bookwyrm/templates/book/edit_book.html:300 +#: bookwyrm/templates/book/edit_book.html:315 msgid "Inventaire ID:" msgstr "ID Inventaire:" @@ -276,10 +302,10 @@ msgstr "Clave Goodreads:" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:140 -#: bookwyrm/templates/book/edit_book.html:328 +#: bookwyrm/templates/book/edit_book.html:343 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -294,8 +320,9 @@ msgstr "Guardar" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:329 +#: bookwyrm/templates/book/edit_book.html:344 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -419,12 +446,12 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:308 +#: bookwyrm/templates/book/edit_book.html:323 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:316 +#: bookwyrm/templates/book/edit_book.html:331 msgid "ASIN:" msgstr "ASIN:" @@ -554,28 +581,34 @@ msgstr "Portada:" msgid "Physical Properties" msgstr "Propiedades físicas:" -#: bookwyrm/templates/book/edit_book.html:257 +#: bookwyrm/templates/book/edit_book.html:259 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit_book.html:265 +#: bookwyrm/templates/book/edit_book.html:270 +#, fuzzy +#| msgid "User details" +msgid "Format details:" +msgstr "Detalles" + +#: bookwyrm/templates/book/edit_book.html:280 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit_book.html:274 +#: bookwyrm/templates/book/edit_book.html:289 msgid "Book Identifiers" msgstr "Identificadores de libro" -#: bookwyrm/templates/book/edit_book.html:276 +#: bookwyrm/templates/book/edit_book.html:291 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit_book.html:284 +#: bookwyrm/templates/book/edit_book.html:299 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit_book.html:292 +#: bookwyrm/templates/book/edit_book.html:307 msgid "Openlibrary ID:" msgstr "ID OpenLibrary:" @@ -701,6 +734,7 @@ msgid "Sorry! We couldn't find that code." msgstr "Sentimos que no pudimos encontrar ese código" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "Código de confirmación:" @@ -1476,8 +1510,27 @@ msgstr "Aprobar" msgid "Discard" msgstr "Desechar" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "Eliminar esta actualización de progreso" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#, fuzzy +#| msgid "This field cannot be null." +msgid "This action cannot be un-done" +msgstr "Este campo no puede ser nulo." + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "Eliminar" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "Editar lista" @@ -1512,6 +1565,12 @@ msgstr "Abierto" msgid "Anyone can add books to this list" msgstr "Cualquer usuario puede agregar libros a esta lista" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "Eliminar status" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "¡Has sugerido un libro para esta lista exitosamente!" @@ -1901,6 +1960,7 @@ msgid "Account" msgstr "Cuenta" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "Perfil" @@ -2021,12 +2081,6 @@ msgstr "Volver a la lista de servidores" msgid "Edit Announcement" msgstr "Editar anuncio" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "Eliminar" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "Visible:" @@ -2077,6 +2131,7 @@ msgstr "Fecha final" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "Status" @@ -2114,7 +2169,7 @@ msgstr "Instancia:" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "Status:" @@ -2129,13 +2184,13 @@ msgstr "Bloqueado" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "Software:" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "Versión:" @@ -2162,6 +2217,7 @@ msgid "View all" msgstr "Ver todos" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "Informes:" @@ -2178,7 +2234,7 @@ msgid "Blocked by us:" msgstr "Bloqueado por nosotros:" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "Notas" @@ -3108,7 +3164,7 @@ msgstr[1] "%(mutuals_display)s seguidores que sigues" msgid "No followers you follow" msgstr "Ningún seguidor que tu sigues" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "Volver a usuarios" @@ -3135,31 +3191,85 @@ msgid "Remote instance" msgstr "Instancia remota" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "Activ@" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "Inactiv@" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "No establecido" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "Detalles" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "Ver perfil de usuario" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "Local" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "Quitar" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "Detalles" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "Correo electronico" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "View directory" +msgid "(View reports)" +msgstr "Ver directorio" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "Bloqueado por nosotros:" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "actividad reciente" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "Aprobar seguidores a mano:" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discover" +msgid "Discoverable:" +msgstr "Descubrir" + +#: bookwyrm/templates/user_admin/user_info.html:93 +#, fuzzy +#| msgid "Deactivate user" +msgid "Deactivation reason:" +msgstr "Desactivar usuario" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "Detalles de instancia" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "Ver instancia" @@ -3222,9 +3332,6 @@ msgstr "Actualizaciones de status de {obj.display_name}" #~ msgid "Federated Timeline" #~ msgstr "Línea temporal federalizado" -#~ msgid "Local" -#~ msgstr "Local" - #~ msgid "Federated Servers" #~ msgstr "Servidores federalizados" @@ -3348,9 +3455,6 @@ msgstr "Actualizaciones de status de {obj.display_name}" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "El valor %(value)s no es una opción válida." -#~ msgid "This field cannot be null." -#~ msgstr "Este campo no puede ser nulo." - #~ msgid "This field cannot be blank." #~ msgstr "Este campo no puede ser vacio." @@ -4128,9 +4232,6 @@ msgstr "Actualizaciones de status de {obj.display_name}" #~ msgid "Books tagged \"%(tag.name)s\"" #~ msgstr "Libros etiquetados con \"%(tag.name)s\"" -#~ msgid "Deactivate user" -#~ msgstr "Desactivar usuario" - #~ msgid "Reactivate user" #~ msgstr "Reactivar usuario" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 647d18ec..58ae1aa1 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-07 16:12+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -18,59 +18,85 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:195 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "Ajoutez des livres" + +#: bookwyrm/forms.py:196 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "Livre" + +#: bookwyrm/forms.py:197 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/forms.py:198 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "Ajouter une couverture" + +#: bookwyrm/forms.py:199 +msgid "Paperback" +msgstr "" + +#: bookwyrm/forms.py:246 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:260 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:261 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:251 +#: bookwyrm/forms.py:262 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:252 +#: bookwyrm/forms.py:263 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:268 #, python-format msgid "%(count)d uses" msgstr "%(count)d utilisations" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:271 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:310 +#: bookwyrm/forms.py:321 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:311 +#: bookwyrm/forms.py:322 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:312 +#: bookwyrm/forms.py:323 #: 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:314 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:325 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Trier par" -#: bookwyrm/forms.py:318 +#: bookwyrm/forms.py:329 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:319 +#: bookwyrm/forms.py:330 msgid "Descending" msgstr "Ordre décroissant" @@ -266,7 +292,7 @@ msgid "Openlibrary key:" msgstr "Clé Openlibrary :" #: bookwyrm/templates/author/edit_author.html:89 -#: bookwyrm/templates/book/edit_book.html:300 +#: bookwyrm/templates/book/edit_book.html:315 msgid "Inventaire ID:" msgstr "Identifiant Inventaire :" @@ -280,10 +306,10 @@ msgstr "Clé Goodreads :" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:140 -#: bookwyrm/templates/book/edit_book.html:328 +#: bookwyrm/templates/book/edit_book.html:343 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -298,8 +324,9 @@ msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:329 +#: bookwyrm/templates/book/edit_book.html:344 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -423,12 +450,12 @@ msgid "ISBN:" msgstr "ISBN :" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:308 +#: bookwyrm/templates/book/edit_book.html:323 msgid "OCLC Number:" msgstr "Numéro OCLC :" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:316 +#: bookwyrm/templates/book/edit_book.html:331 msgid "ASIN:" msgstr "ASIN :" @@ -558,28 +585,34 @@ msgstr "Couverture" msgid "Physical Properties" msgstr "Propriétés physiques" -#: bookwyrm/templates/book/edit_book.html:257 +#: bookwyrm/templates/book/edit_book.html:259 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "Format :" -#: bookwyrm/templates/book/edit_book.html:265 +#: bookwyrm/templates/book/edit_book.html:270 +#, fuzzy +#| msgid "User details" +msgid "Format details:" +msgstr "Détails du compte" + +#: bookwyrm/templates/book/edit_book.html:280 msgid "Pages:" msgstr "Pages :" -#: bookwyrm/templates/book/edit_book.html:274 +#: bookwyrm/templates/book/edit_book.html:289 msgid "Book Identifiers" msgstr "Identifiants du livre" -#: bookwyrm/templates/book/edit_book.html:276 +#: bookwyrm/templates/book/edit_book.html:291 msgid "ISBN 13:" msgstr "ISBN 13 :" -#: bookwyrm/templates/book/edit_book.html:284 +#: bookwyrm/templates/book/edit_book.html:299 msgid "ISBN 10:" msgstr "ISBN 10 :" -#: bookwyrm/templates/book/edit_book.html:292 +#: bookwyrm/templates/book/edit_book.html:307 msgid "Openlibrary ID:" msgstr "Identifiant Openlibrary :" @@ -707,6 +740,7 @@ msgid "Sorry! We couldn't find that code." msgstr "Pardon ! Nous ne reconnaissons pas ce code." #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "Code de confirmation :" @@ -1495,8 +1529,27 @@ msgstr "Approuver" msgid "Discard" msgstr "Rejeter" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "Supprimer cette mise à jour" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#, fuzzy +#| msgid "This shelf is empty." +msgid "This action cannot be un-done" +msgstr "Cette étagère est vide" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "Supprimer" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "Modifier la liste" @@ -1531,6 +1584,12 @@ msgstr "Ouverte" msgid "Anyone can add books to this list" msgstr "N’importe qui peut suggérer des livres" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "Supprimer le statut" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "Vous avez suggéré un livre à cette liste !" @@ -1930,6 +1989,7 @@ msgid "Account" msgstr "Compte" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "Profil" @@ -2053,12 +2113,6 @@ msgstr "Retour à la liste" msgid "Edit Announcement" msgstr "Modifier l’annonce" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "Supprimer" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "Visible :" @@ -2109,6 +2163,7 @@ msgstr "Date de fin" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "Statut" @@ -2146,7 +2201,7 @@ msgstr "Instance :" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "Statut :" @@ -2161,13 +2216,13 @@ msgstr "Bloqué" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "Logiciel :" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "Description :" @@ -2194,6 +2249,7 @@ msgid "View all" msgstr "Voir tous" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "Signalements :" @@ -2210,7 +2266,7 @@ msgid "Blocked by us:" msgstr "Bloqués par nous :" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "Remarques" @@ -3159,7 +3215,7 @@ msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez" msgid "No followers you follow" msgstr "compte que vous suivez" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "Retour aux comptes" @@ -3186,31 +3242,85 @@ msgid "Remote instance" msgstr "Instance distante" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "Actif" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "Inactif" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "Non défini" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "Détails du compte" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "Voir le profil" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "Local" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "Retirer" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "Détails du compte" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "Email" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "Directory" +msgid "(View reports)" +msgstr "Répertoire" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "Bloqués par nous :" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "dernière activité" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "Autoriser les abonnements manuellement :" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discard" +msgid "Discoverable:" +msgstr "Rejeter" + +#: bookwyrm/templates/user_admin/user_info.html:93 +#, fuzzy +#| msgid "Deactivate user" +msgid "Deactivation reason:" +msgstr "Désactiver le compte" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "Détails de l’instance" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "Voir l’instance" @@ -3273,9 +3383,6 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "Fil d’actualité des instances fédérées" -#~ msgid "Local" -#~ msgstr "Local" - #, fuzzy #~| msgid "BookWyrm users" #~ msgid "BookWyrm\\" @@ -3331,11 +3438,6 @@ msgstr "" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "%(value)s n’est pas une remote_id valide." -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "This field cannot be null." -#~ msgstr "Cette étagère est vide" - #, fuzzy #~| msgid "A user with this email already exists." #~ msgid "%(model_name)s with this %(field_label)s already exists." @@ -3555,9 +3657,6 @@ msgstr "" #~ msgid "by %(author)s" #~ msgstr "par %(author)s" -#~ msgid "Deactivate user" -#~ msgstr "Désactiver le compte" - #~ msgid "Reactivate user" #~ msgstr "Réactiver le compte" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 3adb5aef..41188afe 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-07 16:12+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -18,59 +18,85 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:195 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "添加书目" + +#: bookwyrm/forms.py:196 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "书目" + +#: bookwyrm/forms.py:197 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/forms.py:198 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "添加封面" + +#: bookwyrm/forms.py:199 +msgid "Paperback" +msgstr "" + +#: bookwyrm/forms.py:246 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:260 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:261 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:251 +#: bookwyrm/forms.py:262 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:252 +#: bookwyrm/forms.py:263 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:268 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:271 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:310 +#: bookwyrm/forms.py:321 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:311 +#: bookwyrm/forms.py:322 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:312 +#: bookwyrm/forms.py:323 #: 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:314 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:325 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:318 +#: bookwyrm/forms.py:329 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:319 +#: bookwyrm/forms.py:330 msgid "Descending" msgstr "降序" @@ -262,7 +288,7 @@ msgid "Openlibrary key:" msgstr "Openlibrary key:" #: bookwyrm/templates/author/edit_author.html:89 -#: bookwyrm/templates/book/edit_book.html:300 +#: bookwyrm/templates/book/edit_book.html:315 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -276,10 +302,10 @@ msgstr "Goodreads key:" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:140 -#: bookwyrm/templates/book/edit_book.html:328 +#: bookwyrm/templates/book/edit_book.html:343 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -294,8 +320,9 @@ msgstr "保存" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:329 +#: bookwyrm/templates/book/edit_book.html:344 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -418,12 +445,12 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:308 +#: bookwyrm/templates/book/edit_book.html:323 msgid "OCLC Number:" msgstr "OCLC 号:" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:316 +#: bookwyrm/templates/book/edit_book.html:331 msgid "ASIN:" msgstr "ASIN:" @@ -553,28 +580,34 @@ msgstr "封面" msgid "Physical Properties" msgstr "实体性质" -#: bookwyrm/templates/book/edit_book.html:257 +#: bookwyrm/templates/book/edit_book.html:259 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit_book.html:265 +#: bookwyrm/templates/book/edit_book.html:270 +#, fuzzy +#| msgid "User details" +msgid "Format details:" +msgstr "用户详情" + +#: bookwyrm/templates/book/edit_book.html:280 msgid "Pages:" msgstr "页数:" -#: bookwyrm/templates/book/edit_book.html:274 +#: bookwyrm/templates/book/edit_book.html:289 msgid "Book Identifiers" msgstr "书目标识号" -#: bookwyrm/templates/book/edit_book.html:276 +#: bookwyrm/templates/book/edit_book.html:291 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit_book.html:284 +#: bookwyrm/templates/book/edit_book.html:299 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit_book.html:292 +#: bookwyrm/templates/book/edit_book.html:307 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" @@ -702,6 +735,7 @@ msgid "Sorry! We couldn't find that code." msgstr "抱歉！我们无法找到该代码。" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "确认代码:" @@ -1477,8 +1511,25 @@ msgstr "批准" msgid "Discard" msgstr "削除" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "删除此进度更新" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "删除" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "编辑列表" @@ -1513,6 +1564,12 @@ msgstr "开放" msgid "Anyone can add books to this list" msgstr "任何人都可以向此列表中添加书目" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "删除发文" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "你成功向该列表推荐了一本书！" @@ -1909,6 +1966,7 @@ msgid "Account" msgstr "帐号" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "个人资料" @@ -2029,12 +2087,6 @@ msgstr "回到列表" msgid "Edit Announcement" msgstr "编辑公告" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "删除" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "可见:" @@ -2085,6 +2137,7 @@ msgstr "结束日期" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "状态" @@ -2122,7 +2175,7 @@ msgstr "实例:" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "状态:" @@ -2137,13 +2190,13 @@ msgstr "已屏蔽" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "软件:" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "版本:" @@ -2170,6 +2223,7 @@ msgid "View all" msgstr "查看全部" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "报告:" @@ -2186,7 +2240,7 @@ msgid "Blocked by us:" msgstr "我们所屏蔽的:" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "备注" @@ -3106,7 +3160,7 @@ msgstr[0] "%(mutuals_display)s 个你也关注的关注者" msgid "No followers you follow" msgstr "没有你关注的关注者" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "回到用户" @@ -3133,31 +3187,83 @@ msgid "Remote instance" msgstr "移除服务器" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "活跃" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "停用" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "未设置" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "用户详情" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "查看用户个人资料" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "本站" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "移除" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "用户详情" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "邮箱" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "Directory" +msgid "(View reports)" +msgstr "目录" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "我们所屏蔽的:" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "最后活跃" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "手动批准关注者:" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discover" +msgid "Discoverable:" +msgstr "发现" + +#: bookwyrm/templates/user_admin/user_info.html:93 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "实例详情" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "查看实例" @@ -3219,6 +3325,3 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "跨站时间线" - -#~ msgid "Local" -#~ msgstr "本站" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 2149c913..317cf052 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-07 16:12+0000\n" "PO-Revision-Date: 2021-06-30 10:36+0000\n" "Last-Translator: Grace Cheng \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,85 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:195 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "新增書目" + +#: bookwyrm/forms.py:196 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "書目" + +#: bookwyrm/forms.py:197 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/forms.py:198 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "新增封面" + +#: bookwyrm/forms.py:199 +msgid "Paperback" +msgstr "" + +#: bookwyrm/forms.py:246 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:260 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:261 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:251 +#: bookwyrm/forms.py:262 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:252 +#: bookwyrm/forms.py:263 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:268 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:271 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:310 +#: bookwyrm/forms.py:321 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:311 +#: bookwyrm/forms.py:322 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:312 +#: bookwyrm/forms.py:323 #: 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:314 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:325 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:318 +#: bookwyrm/forms.py:329 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:319 +#: bookwyrm/forms.py:330 msgid "Descending" msgstr "降序" @@ -268,7 +294,7 @@ msgid "Openlibrary key:" msgstr "Openlibrary key:" #: bookwyrm/templates/author/edit_author.html:89 -#: bookwyrm/templates/book/edit_book.html:300 +#: bookwyrm/templates/book/edit_book.html:315 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -282,10 +308,10 @@ msgstr "Goodreads key:" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:140 -#: bookwyrm/templates/book/edit_book.html:328 +#: bookwyrm/templates/book/edit_book.html:343 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -300,8 +326,9 @@ msgstr "儲存" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:329 +#: bookwyrm/templates/book/edit_book.html:344 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -424,12 +451,12 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:308 +#: bookwyrm/templates/book/edit_book.html:323 msgid "OCLC Number:" msgstr "OCLC 號:" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:316 +#: bookwyrm/templates/book/edit_book.html:331 msgid "ASIN:" msgstr "ASIN:" @@ -561,28 +588,34 @@ msgstr "封面" msgid "Physical Properties" msgstr "實體性質" -#: bookwyrm/templates/book/edit_book.html:257 +#: bookwyrm/templates/book/edit_book.html:259 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit_book.html:265 +#: bookwyrm/templates/book/edit_book.html:270 +#, fuzzy +#| msgid "User details" +msgid "Format details:" +msgstr "使用者詳情" + +#: bookwyrm/templates/book/edit_book.html:280 msgid "Pages:" msgstr "頁數:" -#: bookwyrm/templates/book/edit_book.html:274 +#: bookwyrm/templates/book/edit_book.html:289 msgid "Book Identifiers" msgstr "書目標識號" -#: bookwyrm/templates/book/edit_book.html:276 +#: bookwyrm/templates/book/edit_book.html:291 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit_book.html:284 +#: bookwyrm/templates/book/edit_book.html:299 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit_book.html:292 +#: bookwyrm/templates/book/edit_book.html:307 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" @@ -714,6 +747,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 #, fuzzy #| msgid "Confirm password:" msgid "Confirmation code:" @@ -1506,8 +1540,25 @@ msgstr "批准" msgid "Discard" msgstr "放棄" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "刪除此進度更新" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "刪除" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "編輯列表" @@ -1542,6 +1593,12 @@ msgstr "開放" msgid "Anyone can add books to this list" msgstr "任何人都可以向此列表新增書目" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "刪除狀態" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "你成功！向該列表推薦了一本書" @@ -1941,6 +1998,7 @@ msgid "Account" msgstr "帳號" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "使用者資料" @@ -2064,12 +2122,6 @@ msgstr "回到列表" msgid "Edit Announcement" msgstr "編輯公告" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "刪除" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "可見:" @@ -2120,6 +2172,7 @@ msgstr "結束日期" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "狀態" @@ -2157,7 +2210,7 @@ msgstr "實例:" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "狀態:" @@ -2172,13 +2225,13 @@ msgstr "已封鎖" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "軟件:" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "版本:" @@ -2205,6 +2258,7 @@ msgid "View all" msgstr "檢視全部" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "舉報:" @@ -2221,7 +2275,7 @@ msgid "Blocked by us:" msgstr "我們所封鎖的:" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "備註" @@ -3164,7 +3218,7 @@ msgstr[0] "%(mutuals_display)s 個你也關注的關注者" msgid "No followers you follow" msgstr "你關注的關注者" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "回到使用者" @@ -3191,31 +3245,83 @@ msgid "Remote instance" msgstr "移除伺服器" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "活躍" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "停用" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "未設定" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "使用者詳情" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "檢視使用者資料" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "本站" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "移除" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "使用者詳情" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "郵箱" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "Directory" +msgid "(View reports)" +msgstr "目錄" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "我們所封鎖的:" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "最後活躍" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "手動批准關注者:" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discard" +msgid "Discoverable:" +msgstr "放棄" + +#: bookwyrm/templates/user_admin/user_info.html:93 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "實例詳情" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "檢視實例" @@ -3277,6 +3383,3 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "跨站時間線" - -#~ msgid "Local" -#~ msgstr "本站" From 8420d0a173e00df640f71459f38c14a66ce81772 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Sep 2021 12:50:24 -0700 Subject: [PATCH 09/16] Adds format translations --- locale/de_DE/LC_MESSAGES/django.po | 80 ++++++++++++++-------------- locale/en_US/LC_MESSAGES/django.po | 68 +++++++++++------------ locale/es/LC_MESSAGES/django.po | 80 ++++++++++++++-------------- locale/fr_FR/LC_MESSAGES/django.po | 80 ++++++++++++++-------------- locale/zh_Hans/LC_MESSAGES/django.po | 80 ++++++++++++++-------------- locale/zh_Hant/LC_MESSAGES/django.po | 80 ++++++++++++++-------------- 6 files changed, 234 insertions(+), 234 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 49b1b4b2..73f729d5 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 16:12+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0000\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,98 +18,98 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:195 -#, fuzzy -#| msgid "Add Books" -msgid "Audiobook" -msgstr "Bücher hinzufügen" - -#: bookwyrm/forms.py:196 -#, fuzzy -#| msgid "Book" -msgid "eBook" -msgstr "Buch" - -#: bookwyrm/forms.py:197 -msgid "Graphic novel" -msgstr "" - -#: bookwyrm/forms.py:198 -#, fuzzy -#| msgid "Add cover" -msgid "Hardcover" -msgstr "Cover hinzufügen" - -#: bookwyrm/forms.py:199 -msgid "Paperback" -msgstr "" - -#: bookwyrm/forms.py:246 +#: 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:260 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:261 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:263 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "Läuft nicht aus" -#: bookwyrm/forms.py:268 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d Benutzungen" -#: bookwyrm/forms.py:271 +#: bookwyrm/forms.py:260 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" msgstr "Ungelistet" -#: bookwyrm/forms.py:321 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:322 +#: bookwyrm/forms.py:311 #, fuzzy #| msgid "Title" msgid "Book Title" msgstr "Titel" -#: bookwyrm/forms.py:323 +#: 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:325 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:329 +#: bookwyrm/forms.py:318 #, fuzzy #| msgid "Started reading" msgid "Ascending" msgstr "Zu lesen angefangen" -#: bookwyrm/forms.py:330 +#: bookwyrm/forms.py:319 #, fuzzy #| msgid "Started reading" msgid "Descending" msgstr "Zu lesen angefangen" +#: bookwyrm/models/book.py:230 +#, fuzzy +#| msgid "Add Books" +msgid "Audiobook" +msgstr "Bücher hinzufügen" + +#: bookwyrm/models/book.py:231 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "Buch" + +#: bookwyrm/models/book.py:232 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:233 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "Cover hinzufügen" + +#: bookwyrm/models/book.py:234 +msgid "Paperback" +msgstr "" + #: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 637853e2..41b98835 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.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 16:12+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,82 +18,82 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:195 -msgid "Audiobook" -msgstr "" - -#: bookwyrm/forms.py:196 -msgid "eBook" -msgstr "" - -#: bookwyrm/forms.py:197 -msgid "Graphic novel" -msgstr "" - -#: bookwyrm/forms.py:198 -msgid "Hardcover" -msgstr "" - -#: bookwyrm/forms.py:199 -msgid "Paperback" -msgstr "" - -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:261 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:263 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:268 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:271 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:321 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:322 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:323 +#: 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:325 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:329 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:330 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "" +#: bookwyrm/models/book.py:230 +msgid "Audiobook" +msgstr "" + +#: bookwyrm/models/book.py:231 +msgid "eBook" +msgstr "" + +#: bookwyrm/models/book.py:232 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:233 +msgid "Hardcover" +msgstr "" + +#: bookwyrm/models/book.py:234 +msgid "Paperback" +msgstr "" + #: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 12c4fb35..904a07ca 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 16:12+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0000\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: Reese Porter \n" "Language-Team: LANGUAGE \n" @@ -18,88 +18,88 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:195 -#, fuzzy -#| msgid "Add books" -msgid "Audiobook" -msgstr "Agregar libros" - -#: bookwyrm/forms.py:196 -#, fuzzy -#| msgid "Book" -msgid "eBook" -msgstr "Libro" - -#: bookwyrm/forms.py:197 -msgid "Graphic novel" -msgstr "" - -#: bookwyrm/forms.py:198 -#, fuzzy -#| msgid "Add cover" -msgid "Hardcover" -msgstr "Agregar portada" - -#: bookwyrm/forms.py:199 -msgid "Paperback" -msgstr "" - -#: bookwyrm/forms.py:246 +#: 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:260 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:261 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:263 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "Nunca se vence" -#: bookwyrm/forms.py:268 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d usos" -#: bookwyrm/forms.py:271 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:321 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:322 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:323 +#: 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:325 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:329 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:330 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "Descendente" +#: bookwyrm/models/book.py:230 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "Agregar libros" + +#: bookwyrm/models/book.py:231 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "Libro" + +#: bookwyrm/models/book.py:232 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:233 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "Agregar portada" + +#: bookwyrm/models/book.py:234 +msgid "Paperback" +msgstr "" + #: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 58ae1aa1..2312e30b 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/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-09-07 16:12+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -18,88 +18,88 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:195 -#, fuzzy -#| msgid "Add books" -msgid "Audiobook" -msgstr "Ajoutez des livres" - -#: bookwyrm/forms.py:196 -#, fuzzy -#| msgid "Book" -msgid "eBook" -msgstr "Livre" - -#: bookwyrm/forms.py:197 -msgid "Graphic novel" -msgstr "" - -#: bookwyrm/forms.py:198 -#, fuzzy -#| msgid "Add cover" -msgid "Hardcover" -msgstr "Ajouter une couverture" - -#: bookwyrm/forms.py:199 -msgid "Paperback" -msgstr "" - -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:261 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:263 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:268 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d utilisations" -#: bookwyrm/forms.py:271 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:321 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:322 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:323 +#: 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:325 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:329 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:330 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "Ordre décroissant" +#: bookwyrm/models/book.py:230 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "Ajoutez des livres" + +#: bookwyrm/models/book.py:231 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "Livre" + +#: bookwyrm/models/book.py:232 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:233 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "Ajouter une couverture" + +#: bookwyrm/models/book.py:234 +msgid "Paperback" +msgstr "" + #: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 41188afe..a8212af8 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/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-09-07 16:12+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -18,88 +18,88 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:195 -#, fuzzy -#| msgid "Add books" -msgid "Audiobook" -msgstr "添加书目" - -#: bookwyrm/forms.py:196 -#, fuzzy -#| msgid "Book" -msgid "eBook" -msgstr "书目" - -#: bookwyrm/forms.py:197 -msgid "Graphic novel" -msgstr "" - -#: bookwyrm/forms.py:198 -#, fuzzy -#| msgid "Add cover" -msgid "Hardcover" -msgstr "添加封面" - -#: bookwyrm/forms.py:199 -msgid "Paperback" -msgstr "" - -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:261 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:263 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:268 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:271 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:321 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:322 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:323 +#: 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:325 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:329 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:330 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "降序" +#: bookwyrm/models/book.py:230 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "添加书目" + +#: bookwyrm/models/book.py:231 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "书目" + +#: bookwyrm/models/book.py:232 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:233 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "添加封面" + +#: bookwyrm/models/book.py:234 +msgid "Paperback" +msgstr "" + #: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 317cf052..a5d7ea94 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 16:12+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0000\n" "PO-Revision-Date: 2021-06-30 10:36+0000\n" "Last-Translator: Grace Cheng \n" "Language-Team: LANGUAGE \n" @@ -18,88 +18,88 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:195 -#, fuzzy -#| msgid "Add books" -msgid "Audiobook" -msgstr "新增書目" - -#: bookwyrm/forms.py:196 -#, fuzzy -#| msgid "Book" -msgid "eBook" -msgstr "書目" - -#: bookwyrm/forms.py:197 -msgid "Graphic novel" -msgstr "" - -#: bookwyrm/forms.py:198 -#, fuzzy -#| msgid "Add cover" -msgid "Hardcover" -msgstr "新增封面" - -#: bookwyrm/forms.py:199 -msgid "Paperback" -msgstr "" - -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:260 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:261 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:263 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:268 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:271 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:321 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:322 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:323 +#: 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:325 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:329 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:330 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "降序" +#: bookwyrm/models/book.py:230 +#, fuzzy +#| msgid "Add books" +msgid "Audiobook" +msgstr "新增書目" + +#: bookwyrm/models/book.py:231 +#, fuzzy +#| msgid "Book" +msgid "eBook" +msgstr "書目" + +#: bookwyrm/models/book.py:232 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:233 +#, fuzzy +#| msgid "Add cover" +msgid "Hardcover" +msgstr "新增封面" + +#: bookwyrm/models/book.py:234 +msgid "Paperback" +msgstr "" + #: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" From 6db0bf4b6aa13bd783e9d61cf7698d76550e6a9d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Sep 2021 12:51:07 -0700 Subject: [PATCH 10/16] Adds AP field --- bookwyrm/activitypub/book.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index bd27c4e6..d8599c4b 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -54,6 +54,7 @@ class Edition(Book): asin: str = "" pages: int = None physicalFormat: str = "" + physicalFormatDetail: str = "" publishers: List[str] = field(default_factory=lambda: []) editionRank: int = 0 From 54a8815f4948861bc4a76dda1d9f0a686f9c1152 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Sep 2021 11:49:57 -0700 Subject: [PATCH 11/16] Updates migrations --- .../migrations/0080_merge_20210804_2114.py | 13 -------- .../migrations/0089_merge_20210907_0514.py | 13 -------- .../0090_alter_edition_physical_format.py | 30 ------------------- ...t_detail.py => 0101_auto_20210929_1847.py} | 8 ++--- 4 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 bookwyrm/migrations/0080_merge_20210804_2114.py delete mode 100644 bookwyrm/migrations/0089_merge_20210907_0514.py delete mode 100644 bookwyrm/migrations/0090_alter_edition_physical_format.py rename bookwyrm/migrations/{0077_rename_physical_format_edition_physical_format_detail.py => 0101_auto_20210929_1847.py} (93%) diff --git a/bookwyrm/migrations/0080_merge_20210804_2114.py b/bookwyrm/migrations/0080_merge_20210804_2114.py deleted file mode 100644 index d8365eaf..00000000 --- a/bookwyrm/migrations/0080_merge_20210804_2114.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 3.2.4 on 2021-08-04 21:14 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0077_rename_physical_format_edition_physical_format_detail"), - ("bookwyrm", "0079_merge_20210804_1746"), - ] - - operations = [] diff --git a/bookwyrm/migrations/0089_merge_20210907_0514.py b/bookwyrm/migrations/0089_merge_20210907_0514.py deleted file mode 100644 index 86d29599..00000000 --- a/bookwyrm/migrations/0089_merge_20210907_0514.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 3.2.4 on 2021-09-07 05:14 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0080_merge_20210804_2114"), - ("bookwyrm", "0088_auto_20210905_2233"), - ] - - operations = [] diff --git a/bookwyrm/migrations/0090_alter_edition_physical_format.py b/bookwyrm/migrations/0090_alter_edition_physical_format.py deleted file mode 100644 index b37a75a6..00000000 --- a/bookwyrm/migrations/0090_alter_edition_physical_format.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2.4 on 2021-09-07 19:46 - -import bookwyrm.models.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0089_merge_20210907_0514"), - ] - - operations = [ - migrations.AlterField( - model_name="edition", - name="physical_format", - field=bookwyrm.models.fields.CharField( - blank=True, - choices=[ - ("AudiobookFormat", "Audiobook"), - ("EBook", "eBook"), - ("GraphicNovel", "Graphic novel"), - ("Hardcover", "Hardcover"), - ("Paperback", "Paperback"), - ], - max_length=255, - null=True, - ), - ), - ] diff --git a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py b/bookwyrm/migrations/0101_auto_20210929_1847.py similarity index 93% rename from bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py rename to bookwyrm/migrations/0101_auto_20210929_1847.py index fcff9352..346dbf88 100644 --- a/bookwyrm/migrations/0077_rename_physical_format_edition_physical_format_detail.py +++ b/bookwyrm/migrations/0101_auto_20210929_1847.py @@ -75,7 +75,7 @@ def reverse(app_registry, schema_editor): class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0076_preview_images"), + ('bookwyrm', '0100_shelf_description'), ] operations = [ @@ -90,9 +90,9 @@ class Migration(migrations.Migration): field=bookwyrm.models.fields.CharField( blank=True, choices=[ - ("AudiobookFormat", "Audiobookformat"), - ("EBook", "Ebook"), - ("GraphicNovel", "Graphicnovel"), + ("AudiobookFormat", "Audiobook"), + ("EBook", "eBook"), + ("GraphicNovel", "Graphic novel"), ("Hardcover", "Hardcover"), ("Paperback", "Paperback"), ], From 47706b5353be2b8927bda8fab7add0de8611f502 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Sep 2021 11:59:09 -0700 Subject: [PATCH 12/16] Use detail field on book paeg and meta --- bookwyrm/templates/book/publisher_info.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html index b7975a62..42cb4098 100644 --- a/bookwyrm/templates/book/publisher_info.html +++ b/bookwyrm/templates/book/publisher_info.html @@ -4,13 +4,15 @@ {% load humanize %}

- {% with format=book.physical_format pages=book.pages %} + {% firstof book.physical_format_detail book.physical_format as format %} + {% firstof book.physical_format book.physical_format_detail as format_property %} + {% with pages=book.pages %} {% if format %} {% comment %} @todo The bookFormat property is limited to a list of values whereas the book edition is free text. @see https://schema.org/bookFormat {% endcomment %} - + {% endif %} {% if pages %} From 123b23728f428dafe8677a03d3bc63959037c90c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Sep 2021 12:21:19 -0700 Subject: [PATCH 13/16] Infer format in openlibrary import --- bookwyrm/connectors/abstract_connector.py | 14 +++++ bookwyrm/connectors/format_mappings.py | 43 +++++++++++++++ bookwyrm/connectors/openlibrary.py | 5 +- .../migrations/0101_auto_20210929_1847.py | 54 ++----------------- 4 files changed, 63 insertions(+), 53 deletions(-) create mode 100644 bookwyrm/connectors/format_mappings.py diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 455241cc..8d2e9f15 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -9,6 +9,7 @@ from requests.exceptions import RequestException from bookwyrm import activitypub, models, settings from .connector_manager import load_more_data, ConnectorException +from .format_mappings import format_mappings logger = logging.getLogger(__name__) @@ -312,3 +313,16 @@ class Mapping: return self.formatter(value) except: # pylint: disable=bare-except return None + +def infer_physical_format(format_text): + """ try to figure out what the standardized format is from the free value """ + format_text = format_text.lower() + if format_text in format_mappings: + # try a direct match + return format_mappings[format_text] + else: + # failing that, try substring + matches = [v for k, v in format_mappings.items() if k in format_text] + if not matches: + return None + return matches[0] diff --git a/bookwyrm/connectors/format_mappings.py b/bookwyrm/connectors/format_mappings.py new file mode 100644 index 00000000..61f61efa --- /dev/null +++ b/bookwyrm/connectors/format_mappings.py @@ -0,0 +1,43 @@ +""" comparing a free text format to the standardized one """ +format_mappings = { + "paperback": "Paperback", + "soft": "Paperback", + "pamphlet": "Paperback", + "peperback": "Paperback", + "tapa blanda": "Paperback", + "turtleback": "Paperback", + "pocket": "Paperback", + "spiral": "Paperback", + "ring": "Paperback", + "平装": "Paperback", + "简装": "Paperback", + "hardcover": "Hardcover", + "hardcocer": "Hardcover", + "hardover": "Hardcover", + "hardback": "Hardcover", + "library": "Hardcover", + "tapa dura": "Hardcover", + "leather": "Hardcover", + "clothbound": "Hardcover", + "精装": "Hardcover", + "ebook": "EBook", + "e-book": "EBook", + "digital": "EBook", + "computer file": "EBook", + "epub": "EBook", + "online": "EBook", + "pdf": "EBook", + "elektronische": "EBook", + "electronic": "EBook", + "audiobook": "AudiobookFormat", + "audio": "AudiobookFormat", + "cd": "AudiobookFormat", + "dvd": "AudiobookFormat", + "mp3": "AudiobookFormat", + "cassette": "AudiobookFormat", + "kindle": "AudiobookFormat", + "talking": "AudiobookFormat", + "sound": "AudiobookFormat", + "comic": "GraphicNovel", + "graphic": "GraphicNovel", +} diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index fca5d0f7..7f724d74 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -3,7 +3,7 @@ import re from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult, Mapping -from .abstract_connector import get_data +from .abstract_connector import get_data, infer_physical_format from .connector_manager import ConnectorException from .openlibrary_languages import languages @@ -43,7 +43,8 @@ class Connector(AbstractConnector): ), Mapping("publishedDate", remote_field="publish_date"), Mapping("pages", remote_field="number_of_pages"), - Mapping("physicalFormat", remote_field="physical_format"), + Mapping("physicalFormat", remote_field="physical_format", formatter=infer_physical_format), + Mapping("physicalFormatDetail", remote_field="physical_format"), Mapping("publishers"), ] diff --git a/bookwyrm/migrations/0101_auto_20210929_1847.py b/bookwyrm/migrations/0101_auto_20210929_1847.py index 346dbf88..2acaa127 100644 --- a/bookwyrm/migrations/0101_auto_20210929_1847.py +++ b/bookwyrm/migrations/0101_auto_20210929_1847.py @@ -2,6 +2,7 @@ from django.db import migrations import bookwyrm +from bookwyrm.connectors.abstract_connector import infer_physical_format def infer_format(app_registry, schema_editor): @@ -13,59 +14,10 @@ def infer_format(app_registry, schema_editor): .objects.using(db_alias) .filter(physical_format_detail__isnull=False) ) - mappings = { - "paperback": "Paperback", - "soft": "Paperback", - "pamphlet": "Paperback", - "peperback": "Paperback", - "tapa blanda": "Paperback", - "turtleback": "Paperback", - "pocket": "Paperback", - "spiral": "Paperback", - "ring": "Paperback", - "平装": "Paperback", - "简装": "Paperback", - "hardcover": "Hardcover", - "hardcocer": "Hardcover", - "hardover": "Hardcover", - "hardback": "Hardcover", - "library": "Hardcover", - "tapa dura": "Hardcover", - "leather": "Hardcover", - "clothbound": "Hardcover", - "精装": "Hardcover", - "ebook": "EBook", - "e-book": "EBook", - "digital": "EBook", - "computer file": "EBook", - "epub": "EBook", - "online": "EBook", - "pdf": "EBook", - "elektronische": "EBook", - "electronic": "EBook", - "audiobook": "AudiobookFormat", - "audio": "AudiobookFormat", - "cd": "AudiobookFormat", - "dvd": "AudiobookFormat", - "mp3": "AudiobookFormat", - "cassette": "AudiobookFormat", - "kindle": "AudiobookFormat", - "talking": "AudiobookFormat", - "sound": "AudiobookFormat", - "comic": "GraphicNovel", - "graphic": "GraphicNovel", - } for edition in editions: free_format = edition.physical_format_detail.lower() - if free_format in mappings: - edition.physical_format = mappings[free_format] - edition.save() - else: - matches = [v for k, v in mappings.items() if k in free_format] - if not matches: - continue - edition.physical_format = matches[0] - edition.save() + edition.physical_format = infer_physical_format(free_format) + edition.save() def reverse(app_registry, schema_editor): From 0aef011258bb2affe3764938c5287d4fde6f83a6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Sep 2021 12:29:17 -0700 Subject: [PATCH 14/16] Don't use the format detail if it maps directly --- bookwyrm/connectors/abstract_connector.py | 8 ++++++++ bookwyrm/connectors/openlibrary.py | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 8d2e9f15..17525349 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -326,3 +326,11 @@ def infer_physical_format(format_text): if not matches: return None return matches[0] + +def unique_physical_format(format_text): + """ only store the format if it isn't diretly in the format mappings""" + format_text = format_text.lower() + if format_text in format_mappings: + # try a direct match, so saving this would be redundant + return None + return format_text diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 7f724d74..5177f665 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -3,7 +3,7 @@ import re from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult, Mapping -from .abstract_connector import get_data, infer_physical_format +from .abstract_connector import get_data, infer_physical_format, unique_physical_format from .connector_manager import ConnectorException from .openlibrary_languages import languages @@ -44,7 +44,7 @@ class Connector(AbstractConnector): Mapping("publishedDate", remote_field="publish_date"), Mapping("pages", remote_field="number_of_pages"), Mapping("physicalFormat", remote_field="physical_format", formatter=infer_physical_format), - Mapping("physicalFormatDetail", remote_field="physical_format"), + Mapping("physicalFormatDetail", remote_field="physical_format", formatter=unique_physical_format), Mapping("publishers"), ] From 32391dd64d129bac618d15a0ebdd3da8eae85d9b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Sep 2021 12:38:31 -0700 Subject: [PATCH 15/16] Python formatting --- bookwyrm/connectors/abstract_connector.py | 6 ++++-- bookwyrm/connectors/inventaire.py | 2 +- bookwyrm/connectors/openlibrary.py | 12 ++++++++++-- bookwyrm/migrations/0101_auto_20210929_1847.py | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 17525349..060b7182 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -314,8 +314,9 @@ class Mapping: except: # pylint: disable=bare-except return None + def infer_physical_format(format_text): - """ try to figure out what the standardized format is from the free value """ + """try to figure out what the standardized format is from the free value""" format_text = format_text.lower() if format_text in format_mappings: # try a direct match @@ -327,8 +328,9 @@ def infer_physical_format(format_text): return None return matches[0] + def unique_physical_format(format_text): - """ only store the format if it isn't diretly in the format mappings""" + """only store the format if it isn't diretly in the format mappings""" format_text = format_text.lower() if format_text in format_mappings: # try a direct match, so saving this would be redundant diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 70455488..1bfd2b50 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -8,7 +8,7 @@ from .connector_manager import ConnectorException class Connector(AbstractConnector): - """instantiate a connector for OL""" + """instantiate a connector for inventaire""" def __init__(self, identifier): super().__init__(identifier) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 5177f665..ef8a7b3d 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -43,8 +43,16 @@ class Connector(AbstractConnector): ), Mapping("publishedDate", remote_field="publish_date"), Mapping("pages", remote_field="number_of_pages"), - Mapping("physicalFormat", remote_field="physical_format", formatter=infer_physical_format), - Mapping("physicalFormatDetail", remote_field="physical_format", formatter=unique_physical_format), + Mapping( + "physicalFormat", + remote_field="physical_format", + formatter=infer_physical_format, + ), + Mapping( + "physicalFormatDetail", + remote_field="physical_format", + formatter=unique_physical_format, + ), Mapping("publishers"), ] diff --git a/bookwyrm/migrations/0101_auto_20210929_1847.py b/bookwyrm/migrations/0101_auto_20210929_1847.py index 2acaa127..3fca28ea 100644 --- a/bookwyrm/migrations/0101_auto_20210929_1847.py +++ b/bookwyrm/migrations/0101_auto_20210929_1847.py @@ -27,7 +27,7 @@ def reverse(app_registry, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0100_shelf_description'), + ("bookwyrm", "0100_shelf_description"), ] operations = [ From d36ef2bcf1c11595d261b33df26189b47bd88615 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 29 Sep 2021 12:42:28 -0700 Subject: [PATCH 16/16] Pylint change --- bookwyrm/connectors/abstract_connector.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 060b7182..2d10331b 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -321,12 +321,11 @@ def infer_physical_format(format_text): if format_text in format_mappings: # try a direct match return format_mappings[format_text] - else: - # failing that, try substring - matches = [v for k, v in format_mappings.items() if k in format_text] - if not matches: - return None - return matches[0] + # failing that, try substring + matches = [v for k, v in format_mappings.items() if k in format_text] + if not matches: + return None + return matches[0] def unique_physical_format(format_text):