diff --git a/README.md b/README.md index 2564d7af..41bd7065 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Code contributions are gladly welcomed! If you're not sure where to start, take If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min). ### Translation -Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#workin-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best. +Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#working-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best. ### Financial Support BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo). @@ -118,7 +118,7 @@ If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` ./bw-dev collectstatic ``` -### Workin with translations and locale files +### Working with translations and locale files Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory. The application's language is set by a request header sent by your browser to the application, so to change the language of the application, you can change the default language requested by your browser. @@ -132,7 +132,10 @@ To start translation into a language which is currently supported, run the djang #### Editing a locale When you have a locale file, open the `django.po` in the directory for the language (for example, if you were adding German, `locale/de/LC_MESSAGES/django.po`. All the the text in the application will be shown in paired strings, with `msgid` as the original text, and `msgstr` as the translation (by default, this is set to an empty string, and will display the original text). -Add you translations to the `msgstr` strings, and when you're ready, compile the locale by running: +Add your translations to the `msgstr` strings. As the messages in the application are updated, `gettext` will sometimes add best-guess fuzzy matched options for those translations. When a message is marked as fuzzy, it will not be used in the application, so be sure to remove it when you translate that line. + +When you're done, compile the locale by running: + ``` bash ./bw-dev compilemessages ``` diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html index f6fd7dab..007e6b05 100644 --- a/bookwyrm/templates/notifications.html +++ b/bookwyrm/templates/notifications.html @@ -87,11 +87,11 @@ {% elif notification.notification_type == 'BOOST' %} {% if related_status.status_type == 'Review' %} - {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your review of {{ book.title }}{% endblocktrans %} + {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your review of {{ book_title }}{% endblocktrans %} {% elif related_status.status_type == 'Comment' %} - {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your comment on{{ book.title }}{% endblocktrans %} + {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your comment on{{ book_title }}{% endblocktrans %} {% elif related_status.status_type == 'Quotation' %} - {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your quote from {{ book.title }}{% endblocktrans %} + {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your quote from {{ book_title }}{% endblocktrans %} {% else %} {% blocktrans with related_path=related_status.local_path %}boosted your status{% endblocktrans %} {% endif %} diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index d35bde77..2cddb793 100644 Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 0c770753..68bb0c46 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -435,15 +435,12 @@ msgid "Something went wrong! Sorry about that." msgstr "Une erreur s’est produite ; désolé !" #: bookwyrm/templates/feed/direct_messages.html:8 -#, fuzzy, python-format -#| msgid "favorited your %(preview_name)s" +#, python-format msgid "Direct Messages with %(username)s" msgstr "Messages directs avec %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 #: bookwyrm/templates/layout.html:79 -#, fuzzy -#| msgid "Send direct message" msgid "Direct Messages" msgstr "Messages directs" @@ -662,8 +659,6 @@ msgid "Sorry! This invite code is no longer valid." msgstr "Cette invitation n’est plus valide ; désolé !" #: bookwyrm/templates/layout.html:33 -#, fuzzy -#| msgid "Search for a book" msgid "Search for a book or user" msgstr "Chercher un livre ou un compte" @@ -706,8 +701,6 @@ msgid "Site Configuration" msgstr "Configuration du site" #: bookwyrm/templates/layout.html:117 -#, fuzzy -#| msgid "Log in" msgid "Log out" msgstr "Se déconnecter" @@ -899,8 +892,6 @@ msgid "Not Found" msgstr "Introuvable" #: bookwyrm/templates/notfound.html:9 -#, fuzzy -#| msgid "The page your requested doesn't seem to exist!" msgid "The page you requested doesn't seem to exist!" msgstr "Il semblerait que la page que vous avez demandée n’existe pas !" @@ -909,74 +900,62 @@ msgid "Delete notifications" msgstr "Supprimer les notifications" #: bookwyrm/templates/notifications.html:49 -#, fuzzy, python-format -#| msgid "favorited your %(preview_name)s" +#, python-format msgid "favorited your review of %(book_title)s" msgstr "a ajouté votre critique de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:51 -#, fuzzy, python-format -#| msgid "favorited your %(preview_name)s" +#, python-format msgid "favorited your comment on %(book_title)s" msgstr "a ajouté votre commentaire sur %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:53 -#, fuzzy, python-format -#| msgid "favorited your %(preview_name)s" +#, python-format msgid "favorited your quote from %(book_title)s" msgstr "a ajouté votre citation de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:55 -#, fuzzy, python-format -#| msgid "favorited your %(preview_name)s" +#, python-format msgid "favorited your status" msgstr "a ajouté votre statut à ses favoris" #: bookwyrm/templates/notifications.html:60 -#, fuzzy, python-format -#| msgid "mentioned you in a %(preview_name)s" +#, python-format msgid "mentioned you in a review of %(book_title)s" msgstr "vous a mentionné dans sa critique de %(book_title)s" #: bookwyrm/templates/notifications.html:62 -#, fuzzy, python-format -#| msgid "mentioned you in a %(preview_name)s" +#, python-format msgid "mentioned you in a comment on %(book_title)s" msgstr "vous a mentionné dans son commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:64 -#, fuzzy, python-format -#| msgid "mentioned you in a %(preview_name)s" +#, python-format msgid "mentioned you in a quote from %(book_title)s" msgstr "vous a mentionné dans sa citation de %(book_title)s" #: bookwyrm/templates/notifications.html:66 -#, fuzzy, python-format -#| msgid "mentioned you in a %(preview_name)s" +#, python-format msgid "mentioned you in a status" msgstr "vous a mentionné dans son statut" #: bookwyrm/templates/notifications.html:71 -#, fuzzy, python-format -#| msgid "replied to your %(preview_name)s" +#, python-format msgid "replied to your review of %(book_title)s" msgstr "a répondu à votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:73 -#, fuzzy, python-format -#| msgid "replied to your %(preview_name)s" +#, python-format msgid "replied to your comment on %(book_title)s" msgstr "a répondu à votre commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:75 -#, fuzzy, python-format -#| msgid "replied to your %(preview_name)s" +#, python-format msgid "replied to your quote from %(book_title)s" msgstr "a répondu à votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:77 -#, fuzzy, python-format -#| msgid "replied to your %(preview_name)s" +#, python-format msgid "replied to your status" msgstr "a répondu à votre statut" @@ -989,38 +968,32 @@ msgid "sent you a follow request" msgstr "vous a envoyé une demande d’abonnement" #: bookwyrm/templates/notifications.html:90 -#, fuzzy, python-format -#| msgid "boosted your %(preview_name)s" -msgid "boosted your review of %(book.title)s" +#, python-format +msgid "boosted your review of %(book_title)s" msgstr "a partagé votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:92 -#, fuzzy, python-format -#| msgid "boosted your %(preview_name)s" -msgid "boosted your comment on%(book.title)s" +#, python-format +msgid "boosted your comment on%(book_title)s" msgstr "a partagé votre commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:94 -#, fuzzy, python-format -#| msgid "boosted your %(preview_name)s" -msgid "boosted your quote from %(book.title)s" +#, python-format +msgid "boosted your quote from %(book_title)s" msgstr "a partagé votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:96 -#, fuzzy, python-format -#| msgid "boosted your %(preview_name)s" +#, python-format msgid "boosted your status" msgstr "a partagé votre statut" #: bookwyrm/templates/notifications.html:100 -#, fuzzy, python-format -#| msgid "replied to your %(preview_name)s" +#, python-format msgid " added %(book_title)s to your list \"%(list_name)s\"" msgstr " a ajouté %(book_title)s à votre liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:102 -#, fuzzy, python-format -#| msgid "replied to your %(preview_name)s" +#, python-format msgid " suggested adding %(book_title)s to your list \"%(list_name)s\"" msgstr " a suggégré l’ajout de %(book_title)s à votre liste « %(list_name)s »" @@ -1114,8 +1087,6 @@ msgid "Relationships" msgstr "Relations" #: bookwyrm/templates/search_results.html:4 -#, fuzzy -#| msgid "Search Results for \"%(query)s\"" msgid "Search Results" msgstr "Résultats de recherche" @@ -1164,8 +1135,6 @@ msgid "No lists found for \"%(query)s\"" msgstr "Aucune liste trouvée pour « %(query)s »" #: bookwyrm/templates/settings/admin_layout.html:4 -#, fuzzy -#| msgid "Registration" msgid "Administration" msgstr "Administration" @@ -1319,8 +1288,6 @@ msgid "Un-block" msgstr "Débloquer" #: bookwyrm/templates/snippets/book_titleby.html:3 -#, fuzzy, python-format -#| msgid "Editions of \"%(work_title)s\"" msgid "%(title)s by " msgstr "%(title)s par " @@ -1369,8 +1336,6 @@ msgid "No rating" msgstr "Aucune note" #: bookwyrm/templates/snippets/create_status_form.html:54 -#, fuzzy -#| msgid "Spoiler alert:" msgid "Include spoiler alert" msgstr "Afficher une alerte spoiler" @@ -1730,8 +1695,6 @@ msgid "More options" msgstr "Plus d’options" #: bookwyrm/templates/snippets/status/status_options.html:17 -#, fuzzy -#| msgid "Delete post" msgid "Delete status" msgstr "Supprimer le statut" @@ -1755,8 +1718,6 @@ msgstr "Livres tagués « %(tag.name)s »" #: bookwyrm/templates/user/create_shelf_form.html:5 #: bookwyrm/templates/user/create_shelf_form.html:22 -#, fuzzy -#| msgid "Create shelf" msgid "Create Shelf" msgstr "Créer l’étagère" @@ -1770,8 +1731,6 @@ msgstr "Mettre l’étagère à jour" #: bookwyrm/templates/user/followers.html:7 #: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9 -#, fuzzy -#| msgid "User profile" msgid "User Profile" msgstr "Profil" @@ -1790,8 +1749,6 @@ msgid "%(username)s isn't following any users" msgstr "%(username)s n’est abonné(e) à personne" #: bookwyrm/templates/user/lists.html:9 -#, fuzzy -#| msgid "Your lists" msgid "Your Lists" msgstr "Vos listes" @@ -1806,14 +1763,10 @@ msgid "Create list" msgstr "Créer une liste" #: bookwyrm/templates/user/shelf.html:9 -#, fuzzy -#| msgid "Your shelves" msgid "Your Shelves" msgstr "Vos étagères" #: bookwyrm/templates/user/shelf.html:11 -#, fuzzy, python-format -#| msgid "%(username)s has no followers" msgid "%(username)s: Shelves" msgstr "%(username)s : Étagères" @@ -1822,8 +1775,6 @@ msgid "Create shelf" msgstr "Créer l’étagère" #: bookwyrm/templates/user/shelf.html:54 -#, fuzzy -#| msgid "Edit Shelf" msgid "Edit shelf" msgstr "Modifier l’étagère"