Updated text and translations to be more inclusive

This commit is contained in:
Ailé 2021-11-18 16:24:14 +01:00
parent 9177c9d4c2
commit d8b69e9b45
No known key found for this signature in database
GPG Key ID: 96D239A0726DC1FD
4 changed files with 26 additions and 16 deletions

View File

@ -2,14 +2,14 @@
{% from "core/macros.jinja" import user_link_with_pict, delete_godfather %}
{% block title %}
{% trans user_name=profile.get_display_name() %}{{ user_name }}'s godfathers{% endtrans %}
{% trans user_name=profile.get_display_name() %}{{ user_name }}'s family{% endtrans %}
{% endblock %}
{% block content %}
<p><a href="{{ url("core:user_godfathers_tree_pict", user_id=profile.id) }}?family">
{% trans %}Show family picture{% endtrans %}</a></p>
{% if profile.godfathers.exists() %}
<h4>{% trans %}Godfathers{% endtrans %}</h4>
<h4>{% trans %}Godfathers / Godmothers{% endtrans %}</h4>
<ul>
{% for u in profile.godfathers.all() %}
<li> <a href="{{ url("core:user_godfathers", user_id=u.id) }}" class="mini_profile_link" >
@ -19,7 +19,7 @@
<p><a href="{{ url("core:user_godfathers_tree", user_id=profile.id) }}">
{% trans %}Show ancestors tree{% endtrans %}</a></p>
{% else %}
<p>{% trans %}No godfathers{% endtrans %}
<p>{% trans %}No godfathers / godmothers{% endtrans %}
{% endif %}
{% if profile.godchildren.exists() %}
<h4>{% trans %}Godchildren{% endtrans %}</h4>

View File

@ -47,7 +47,7 @@
{% if param == "godchildren" %}
<p>{% trans %}No godchildren{% endtrans %}
{% else %}
<p>{% trans %}No godfathers{% endtrans %}
<p>{% trans %}No godfathers / godmothers{% endtrans %}
{% endif %}
{% endif %}
{% endblock %}

View File

@ -332,7 +332,10 @@ class UserPropForm(forms.ModelForm):
class UserGodfathersForm(forms.Form):
type = forms.ChoiceField(
choices=[("godfather", _("Godfather")), ("godchild", _("Godchild"))],
choices=[
("godfather", _("Godfather / Godmother")),
("godchild", _("Godchild")),
],
label=_("Add"),
)
user = AutoCompleteSelectField(

View File

@ -3233,17 +3233,24 @@ msgid "Change user password"
msgstr "Changer le mot de passe"
#: core/templates/core/user_godfathers.jinja:5
#: core/templates/core/user_godfathers_tree.jinja:7
#, python-format
msgid "%(user_name)s's family"
msgstr "Famille de %(user_name)s"
#: core/templates/core/user_godfathers_tree.jinja:7
msgid "%(user_name)s's godfathers"
msgstr "Parrains de %(user_name)s"
msgstr "Parrains/Marraines de %(user_name)s"
#: core/templates/core/user_godfathers.jinja:10
msgid "Show family picture"
msgstr "Voir une image de la famille"
#: core/templates/core/user_godfathers.jinja:12 core/views/user.py:205
#: core/templates/core/user_godfathers.jinja:12
msgid "Godfathers / Godmothers"
msgstr "Parrains / Marraines"
#: core/views/user.py:477 core/views/user.py:479
#: core/views/user.py:205
msgid "Family"
msgstr "Famille"
@ -3253,12 +3260,12 @@ msgstr "Voir l'arbre des ancêtres"
#: core/templates/core/user_godfathers.jinja:22
#: core/templates/core/user_godfathers_tree.jinja:50
msgid "No godfathers"
msgstr "Pas de parrains"
msgid "No godfathers / godmothers"
msgstr "Pas de famille"
#: core/templates/core/user_godfathers.jinja:25 core/views/user.py:475
msgid "Godchildren"
msgstr "Fillots"
msgstr "Fillots / Fillotes"
#: core/templates/core/user_godfathers.jinja:33
msgid "Show descent tree"
@ -3267,12 +3274,12 @@ msgstr "Voir l'arbre de la descendance"
#: core/templates/core/user_godfathers.jinja:35
#: core/templates/core/user_godfathers_tree.jinja:48
msgid "No godchildren"
msgstr "Pas de fillots"
msgstr "Pas de fillots / fillotes"
#: core/templates/core/user_godfathers_tree.jinja:5
#, python-format
msgid "%(user_name)s's godchildren"
msgstr "Fillots de %(user_name)s"
msgstr "Fillots/Fillotes de %(user_name)s"
#: core/templates/core/user_godfathers_tree.jinja:20
msgid "Already seen (check above)"
@ -3659,12 +3666,12 @@ msgid "Bad image format, only jpeg, png, and gif are accepted"
msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés"
#: core/views/forms.py:334
msgid "Godfather"
msgstr "Parrain"
msgid "Godfather / Godmother"
msgstr "Parrain / Marraine"
#: core/views/forms.py:334
msgid "Godchild"
msgstr "Fillot"
msgstr "Fillot / Fillote"
#: core/views/forms.py:338 counter/views.py:156 trombi/views.py:158
msgid "Select user"