klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-25 10:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated text and translations to be more inclusive

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/templates/core/user_godfathers.jinja
View File

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

2
core/templates/core/user_godfathers_tree.jinja
View File

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

5
core/views/forms.py
View File

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

29
locale/fr/LC_MESSAGES/django.po
View File

@ -3233,17 +3233,24 @@ msgid "Change user password"
msgstr "Changer le mot de passe" msgstr "Changer le mot de passe"
#: core/templates/core/user_godfathers.jinja:5 #: core/templates/core/user_godfathers.jinja:5
#: core/templates/core/user_godfathers_tree.jinja:7
#, python-format #, 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" 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 #: core/templates/core/user_godfathers.jinja:10
msgid "Show family picture" msgid "Show family picture"
msgstr "Voir une image de la famille" 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:477 core/views/user.py:479
#: core/views/user.py:205
msgid "Family" msgid "Family"
msgstr "Famille" 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.jinja:22
#: core/templates/core/user_godfathers_tree.jinja:50 #: core/templates/core/user_godfathers_tree.jinja:50
msgid "No godfathers" msgid "No godfathers / godmothers"
msgstr "Pas de parrains" msgstr "Pas de famille"
#: core/templates/core/user_godfathers.jinja:25 core/views/user.py:475 #: core/templates/core/user_godfathers.jinja:25 core/views/user.py:475
msgid "Godchildren" msgid "Godchildren"
msgstr "Fillots" msgstr "Fillots / Fillotes"
#: core/templates/core/user_godfathers.jinja:33 #: core/templates/core/user_godfathers.jinja:33
msgid "Show descent tree" 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.jinja:35
#: core/templates/core/user_godfathers_tree.jinja:48 #: core/templates/core/user_godfathers_tree.jinja:48
msgid "No godchildren" msgid "No godchildren"
msgstr "Pas de fillots" msgstr "Pas de fillots / fillotes"
#: core/templates/core/user_godfathers_tree.jinja:5 #: core/templates/core/user_godfathers_tree.jinja:5
#, python-format #, python-format
msgid "%(user_name)s's godchildren" 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 #: core/templates/core/user_godfathers_tree.jinja:20
msgid "Already seen (check above)" 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" msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés"
#: core/views/forms.py:334 #: core/views/forms.py:334
msgid "Godfather" msgid "Godfather / Godmother"
msgstr "Parrain" msgstr "Parrain / Marraine"
#: core/views/forms.py:334 #: core/views/forms.py:334
msgid "Godchild" msgid "Godchild"
msgstr "Fillot" msgstr "Fillot / Fillote"
#: core/views/forms.py:338 counter/views.py:156 trombi/views.py:158 #: core/views/forms.py:338 counter/views.py:156 trombi/views.py:158
msgid "Select user" msgid "Select user"