From 93a32f4e1551c3c8843ff3f8a306b1ba7ba5960c Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Nov 2023 14:40:19 +1100 Subject: [PATCH] update import/export user templates - always explain what export file can be used for - provide more information about overwrite vs upsert when importing --- bookwyrm/templates/import/import_user.html | 29 +++++++++++++++++-- .../templates/preferences/export-user.html | 8 ++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/import/import_user.html b/bookwyrm/templates/import/import_user.html index 8e7bb1a09..1871da84f 100644 --- a/bookwyrm/templates/import/import_user.html +++ b/bookwyrm/templates/import/import_user.html @@ -38,9 +38,32 @@ {{ import_form.archive_file }} -
-

{% trans "Importing this file will overwrite any data you currently have saved." %}

-

{% trans "Deselect any data you do not wish to include in your import. Books will always be imported" %}

+
+ {% blocktrans trimmed %} +

Deselect any checkboxes for data you do not wish to include in your import.

+

Importing this file will not delete any data but will overwrite the following information:

+
    +
  • Profile
  • +
      +
    • name
    • +
    • summary
    • +
    • avatar
    • +
    +
  • Settings
  • +
      +
    • whether manual approval is required for other users to follow your account
    • +
    • whether following/followers are shown on your profile
    • +
    • whether your reading goal is shown on your profile
    • +
    • whether you see user follow suggestions
    • +
    • whether your account is suggested to others
    • +
    • your timezone
    • +
    • your default post privacy setting
    • +
    +
  • Reading goals for all years listed in the import file
  • +
+

All other imported data will be added if it does not already exist. For example, if you have an existing list with the same name as an imported list, the existing list settings will not change, any new list items will be added, and no existing list items will be deleted.

+ + {% endblocktrans %}
diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html index 2f63c9e1c..437b6c7be 100644 --- a/bookwyrm/templates/preferences/export-user.html +++ b/bookwyrm/templates/preferences/export-user.html @@ -9,16 +9,16 @@ {% block panel %}
+

+ {% trans "Your exported archive file will include all user data for import into another Bookwyrm server" %} +

{% if next_available %}

- {% blocktrans %} + {% blocktrans trimmed %} You will be able to create a new export file at {{ next_available }} {% endblocktrans %}

{% else %} -

- {% trans "Your exported archive file will include all user data for import into another Bookwyrm server" %} -

{% csrf_token %}