mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-25 02:24:26 +00:00
Links update & translations typos fixes (#671)
* Remove BDF link (as BDF is now part of AE) * Remove unused pages * Fix typos * Fix typo again
This commit is contained in:
Julien Constant
GitHub
parent
4231a7972d
commit
d16bf12611
@ -2,7 +2,7 @@
|
||||
{% from 'core/macros.jinja' import user_profile_link, paginate %}
|
||||
|
||||
{% block content %}
|
||||
<h3>{% trans %}Sellings{% endtrans %}</h3>
|
||||
<h3>{% trans %}Sales{% endtrans %}</h3>
|
||||
<form id="form" action="?page=1" method="post">
|
||||
{% csrf_token %}
|
||||
{{ form }}
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% if object.club_account.exists() %}
|
||||
<h4>{% trans %}Accouting: {% endtrans %}</h4>
|
||||
<h4>{% trans %}Accounting: {% endtrans %}</h4>
|
||||
<ul>
|
||||
{% for ca in object.club_account.all() %}
|
||||
<li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
<p> <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
|
||||
{% endif %}
|
||||
{% if user.can_edit(news) %}
|
||||
<p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be remoderated){% endtrans %}</a></p>
|
||||
<p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be moderated again){% endtrans %}</a></p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -203,11 +203,7 @@
|
||||
<ul class="content">
|
||||
<li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='bdf') }}">{% trans %}BdF{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='bds') }}">{% trans %}BDS{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='cetu') }}">{% trans %}CETU{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='clubs/doceo') }}">{% trans %}Doceo{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='positions') }}">{% trans %}Positions{% endtrans %}</a></li>
|
||||
<li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="menu">
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
{% if user_registered %}
|
||||
{% trans user_name=user_registered.get_display_name() %}Welcome {{ user_name }}!{% endtrans %}<br>
|
||||
{% trans %}You successfully registred and you will soon receive a confirmation mail.{% endtrans %}<br>
|
||||
{% trans %}You successfully registered and you will soon receive a confirmation mail.{% endtrans %}<br>
|
||||
{% trans username=user_registered.username %}Your username is {{ username }}.{% endtrans %}<br>
|
||||
|
||||
{% else %}
|
||||
|
||||
@ -41,11 +41,11 @@
|
||||
{% set refilled = customer.refillings.exists() %}
|
||||
{% if bought or refilled %}
|
||||
{% if bought %}
|
||||
<h5>{% trans %}Account buyings{% endtrans %}</h5>
|
||||
<h5>{% trans %}Account purchases{% endtrans %}</h5>
|
||||
{{ monthly(buyings_month) }}
|
||||
{% endif %}
|
||||
{% if refilled %}
|
||||
<h5>{% trans %}Refillings{% endtrans %}</h5>
|
||||
<h5>{% trans %}Reloads{% endtrans %}</h5>
|
||||
{{ monthly(refilling_month) }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
|
||||
<p><a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Back{% endtrans %}</a></p>
|
||||
{% if customer.buyings.exists() %}
|
||||
<h4>{% trans %}Account buyings{% endtrans %}</h4>
|
||||
<h4>{% trans %}Account purchases{% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
@ -43,7 +43,7 @@
|
||||
</table>
|
||||
{% endif %}
|
||||
{% if customer.refillings.exists() %}
|
||||
<h4>{% trans %}Refillings{% endtrans %}</h4>
|
||||
<h4>{% trans %}Reloads{% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
{{ form }}
|
||||
<p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
|
||||
</form>
|
||||
<h6>{% trans %}Refillings{% endtrans %}</h6>
|
||||
<h6>{% trans %}Reloads{% endtrans %}</h6>
|
||||
<p>
|
||||
{% for b,s in refilling_sums.items() %}
|
||||
{{ b }}: {{ s }} €<br/>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
{% endif %}
|
||||
{% if user.is_owner(c) %}
|
||||
<a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
|
||||
<a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Refillings list{% endtrans %}</a>
|
||||
<a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
@ -41,7 +41,7 @@
|
||||
{% endif %}
|
||||
{% if user.is_owner(c) %}
|
||||
<a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
|
||||
<a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Refillings list{% endtrans %}</a>
|
||||
<a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
{% block content %}
|
||||
<h3>{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}</h3>
|
||||
<div>
|
||||
<h3>{% trans %}Sellings{% endtrans %}</h3>
|
||||
<h3>{% trans %}Sales{% endtrans %}</h3>
|
||||
{% if last_basket %}
|
||||
<h4>{% trans %}Last selling: {% endtrans %}</h4>
|
||||
<p>{% trans %}Client: {% endtrans %}{{ last_customer }} - {% trans %}New amount: {% endtrans %}{{ new_customer_amount }} €.</p>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
{% block content %}
|
||||
<h3>{% trans counter_name=counter %}{{ counter_name }} last operations{% endtrans %}</h3>
|
||||
<h4>{% trans %}Refillings{% endtrans %}</h4>
|
||||
<h4>{% trans %}Reloads{% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
@ -38,7 +38,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<h4>{% trans %}Sellings{% endtrans %}</h4>
|
||||
<h4>{% trans %}Sales{% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
{% from 'core/macros.jinja' import paginate %}
|
||||
|
||||
{% block title %}
|
||||
{%- trans %}Refillings list{% endtrans %} -- {{ counter.name }}
|
||||
{%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
@ -63,7 +63,7 @@ msgstr "IBAN"
|
||||
|
||||
#: accounting/models.py:112
|
||||
msgid "account number"
|
||||
msgstr "numero de compte"
|
||||
msgstr "numéro de compte"
|
||||
|
||||
#: accounting/models.py:116 accounting/models.py:147 club/models.py:275
|
||||
#: com/models.py:75 com/models.py:266 com/models.py:302 counter/models.py:273
|
||||
@ -1173,7 +1173,7 @@ msgstr "Au"
|
||||
#: club/templates/club/club_sellings.jinja:5 club/views.py:154
|
||||
#: club/views.py:483 counter/templates/counter/counter_main.jinja:24
|
||||
#: counter/templates/counter/last_ops.jinja:41
|
||||
msgid "Sellings"
|
||||
msgid "Sales"
|
||||
msgstr "Ventes"
|
||||
|
||||
#: club/templates/club/club_sellings.jinja:9 club/templates/club/stats.jinja:19
|
||||
@ -1278,7 +1278,7 @@ msgid "Counters:"
|
||||
msgstr "Comptoirs : "
|
||||
|
||||
#: club/templates/club/club_tools.jinja:33
|
||||
msgid "Accouting: "
|
||||
msgid "Accounting: "
|
||||
msgstr "Comptabilité : "
|
||||
|
||||
#: club/templates/club/club_tools.jinja:41
|
||||
@ -1295,8 +1295,8 @@ msgid ""
|
||||
"not shown wait until moderation takes action"
|
||||
msgstr ""
|
||||
"Rappelez vous : les mailing listes doivent être modérées, si votre liste "
|
||||
"nouvellement créee n'est pas affichée, attendez jusqu'à qu'un modérateur "
|
||||
"entre en action"
|
||||
"nouvellement créée n'est pas affichée, attendez jusqu'à ce qu'un modérateur "
|
||||
"prenne une décision"
|
||||
|
||||
#: club/templates/club/mailing.jinja:13
|
||||
msgid "Mailing lists waiting for moderation"
|
||||
@ -1671,8 +1671,8 @@ msgid "Moderator: "
|
||||
msgstr "Modérateur : "
|
||||
|
||||
#: com/templates/com/news_detail.jinja:42
|
||||
msgid "Edit (will be remoderated)"
|
||||
msgstr "Éditer (sera resoumise à modération)"
|
||||
msgid "Edit (will be moderated again)"
|
||||
msgstr "Éditer (sera soumise de nouveau à la modération)"
|
||||
|
||||
#: com/templates/com/news_edit.jinja:6 com/templates/com/news_edit.jinja:29
|
||||
msgid "Edit news"
|
||||
@ -1680,7 +1680,7 @@ msgstr "Éditer la nouvelle"
|
||||
|
||||
#: com/templates/com/news_edit.jinja:39
|
||||
msgid "Notice: Information, election result - no date"
|
||||
msgstr "Information, resultat d'élection - sans date"
|
||||
msgstr "Information, résultat d'élection - sans date"
|
||||
|
||||
#: com/templates/com/news_edit.jinja:40
|
||||
msgid "Event: punctual event, associated with one date"
|
||||
@ -1951,7 +1951,7 @@ msgstr "T'es fou? Un événement ne peut pas finir avant même de commencer."
|
||||
|
||||
#: com/views.py:466
|
||||
msgid "Delete and save to regenerate"
|
||||
msgstr "Supprimer et sauver pour regénérer"
|
||||
msgstr "Supprimer et sauver pour régénérer"
|
||||
|
||||
#: com/views.py:481
|
||||
msgid "Weekmail of the "
|
||||
@ -2036,7 +2036,7 @@ msgid ""
|
||||
"Designates whether this user should be treated as active. Unselect this "
|
||||
"instead of deleting accounts."
|
||||
msgstr ""
|
||||
"Est-ce que l'utilisateur doit être traité comme actif. Déselectionnez au "
|
||||
"Est-ce que l'utilisateur doit être traité comme actif. Désélectionnez au "
|
||||
"lieu de supprimer les comptes."
|
||||
|
||||
#: core/models.py:185
|
||||
@ -2085,7 +2085,7 @@ msgstr "pronoms"
|
||||
|
||||
#: core/models.py:234
|
||||
msgid "tshirt size"
|
||||
msgstr "taille de tshirt"
|
||||
msgstr "taille de t-shirt"
|
||||
|
||||
#: core/models.py:237
|
||||
msgid "-"
|
||||
@ -2426,7 +2426,7 @@ msgstr "Voir plus"
|
||||
#: core/templates/core/base.jinja:122
|
||||
#: forum/templates/forum/last_unread.jinja:17
|
||||
msgid "Mark all as read"
|
||||
msgstr "Marquer tout commme lu"
|
||||
msgstr "Marquer tout comme lu"
|
||||
|
||||
#: core/templates/core/base.jinja:132
|
||||
msgid "Logout"
|
||||
@ -2440,33 +2440,17 @@ msgstr "Accueil"
|
||||
msgid "Associations & Clubs"
|
||||
msgstr "Associations & Clubs"
|
||||
|
||||
#: core/templates/core/base.jinja:173
|
||||
#: core/templates/core/base.jinja:204
|
||||
msgid "AE"
|
||||
msgstr "L'AE"
|
||||
|
||||
#: core/templates/core/base.jinja:174
|
||||
#: core/templates/core/base.jinja:205
|
||||
msgid "AE's clubs"
|
||||
msgstr "Les clubs de L'AE"
|
||||
|
||||
#: core/templates/core/base.jinja:175
|
||||
msgid "BdF"
|
||||
msgstr "Le BdF"
|
||||
|
||||
#: core/templates/core/base.jinja:176
|
||||
msgid "BDS"
|
||||
msgstr "Le BDS"
|
||||
|
||||
#: core/templates/core/base.jinja:177
|
||||
msgid "CETU"
|
||||
msgstr "Le CETU"
|
||||
|
||||
#: core/templates/core/base.jinja:178
|
||||
msgid "Doceo"
|
||||
msgstr "Doceo"
|
||||
|
||||
#: core/templates/core/base.jinja:179
|
||||
msgid "Positions"
|
||||
msgstr "Postes à pourvoir"
|
||||
#: core/templates/core/base.jinja:206
|
||||
msgid "Others UTBM's Associations"
|
||||
msgstr "Les autres associations de l'UTBM"
|
||||
|
||||
#: core/templates/core/base.jinja:187 core/templates/core/user_tools.jinja:118
|
||||
msgid "Elections"
|
||||
@ -2780,7 +2764,7 @@ msgstr "Cotisant jusqu'au %(subscription_end)s"
|
||||
|
||||
#: core/templates/core/macros.jinja:86 core/templates/core/user_edit.jinja:40
|
||||
msgid "Account number: "
|
||||
msgstr "Numero de compte : "
|
||||
msgstr "Numéro de compte : "
|
||||
|
||||
#: core/templates/core/macros.jinja:91 launderette/models.py:217
|
||||
msgid "Slot"
|
||||
@ -3004,7 +2988,7 @@ msgstr "Bienvenue, %(user_name)s!"
|
||||
|
||||
#: core/templates/core/register.jinja:10
|
||||
msgid ""
|
||||
"You successfully registred and you will soon receive a confirmation mail."
|
||||
"You successfully registered and you will soon receive a confirmation mail."
|
||||
msgstr ""
|
||||
"Vous vous êtes correctement enregistré, et vous devriez recevoir rapidement "
|
||||
"un email de confirmation."
|
||||
@ -3063,14 +3047,14 @@ msgstr "Compte utilisateur"
|
||||
|
||||
#: core/templates/core/user_account.jinja:44
|
||||
#: core/templates/core/user_account_detail.jinja:13
|
||||
msgid "Account buyings"
|
||||
msgstr "Achat sur compte utilisateur"
|
||||
msgid "Account purchases"
|
||||
msgstr "Achats du compte"
|
||||
|
||||
#: core/templates/core/user_account.jinja:48
|
||||
#: core/templates/core/user_account_detail.jinja:46
|
||||
#: counter/templates/counter/cash_summary_list.jinja:17
|
||||
#: counter/templates/counter/last_ops.jinja:16
|
||||
msgid "Refillings"
|
||||
msgid "Reloads"
|
||||
msgstr "Rechargements"
|
||||
|
||||
#: core/templates/core/user_account.jinja:53
|
||||
@ -4114,7 +4098,7 @@ msgstr "Nouveau comptoir"
|
||||
#: counter/templates/counter/counter_list.jinja:22
|
||||
#: counter/templates/counter/counter_list.jinja:44
|
||||
#: counter/templates/counter/refilling_list.jinja:5
|
||||
msgid "Refillings list"
|
||||
msgid "Reloads list"
|
||||
msgstr "Liste de rechargements"
|
||||
|
||||
#: counter/templates/counter/counter_list.jinja:27
|
||||
@ -5033,7 +5017,7 @@ msgid ""
|
||||
"The code of an UV must only contains uppercase characters without accent and "
|
||||
"numbers"
|
||||
msgstr ""
|
||||
"Le code d'une UV doit seulement contenire des caractères majuscule sans "
|
||||
"Le code d'une UV doit seulement contenir des caractères majuscule sans "
|
||||
"accents et nombres"
|
||||
|
||||
#: pedagogy/models.py:67
|
||||
@ -5058,7 +5042,7 @@ msgstr "département"
|
||||
|
||||
#: pedagogy/models.py:103
|
||||
msgid "objectives"
|
||||
msgstr "objecifs"
|
||||
msgstr "objectifs"
|
||||
|
||||
#: pedagogy/models.py:104
|
||||
msgid "program"
|
||||
@ -5094,7 +5078,7 @@ msgstr "heures TE"
|
||||
|
||||
#: pedagogy/models.py:217 pedagogy/models.py:291
|
||||
msgid "uv"
|
||||
msgstr "uv"
|
||||
msgstr "UE"
|
||||
|
||||
#: pedagogy/models.py:221
|
||||
msgid "global grade"
|
||||
@ -5153,7 +5137,7 @@ msgstr "%(credit_type)s"
|
||||
#: pedagogy/templates/pedagogy/guide.jinja:59
|
||||
#: pedagogy/templates/pedagogy/moderation.jinja:12
|
||||
msgid "UV"
|
||||
msgstr "UV"
|
||||
msgstr "UE"
|
||||
|
||||
#: pedagogy/templates/pedagogy/guide.jinja:61
|
||||
msgid "Department"
|
||||
@ -5253,8 +5237,8 @@ msgid "Key concepts"
|
||||
msgstr "Concepts clefs"
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_detail.jinja:79
|
||||
msgid "UV manager: "
|
||||
msgstr "Gestionnaire d'UV : "
|
||||
msgid "UE manager: "
|
||||
msgstr "Gestionnaire d'UE : "
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_detail.jinja:86 pedagogy/tests.py:453
|
||||
msgid ""
|
||||
@ -5284,23 +5268,23 @@ msgstr "Signaler ce commentaire"
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_edit.jinja:4
|
||||
#: pedagogy/templates/pedagogy/uv_edit.jinja:8
|
||||
msgid "Edit UV"
|
||||
msgstr "Éditer"
|
||||
msgid "Edit UE"
|
||||
msgstr "Éditer l'UE"
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_edit.jinja:27
|
||||
msgid "Import from UTBM"
|
||||
msgstr "Importer depuis l'UTBM"
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_edit.jinja:62
|
||||
msgid "Unknown UV code"
|
||||
msgstr "Code d'UV inconnu"
|
||||
msgid "Unknown UE code"
|
||||
msgstr "Code d'UE inconnu"
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_edit.jinja:77
|
||||
msgid "Successful autocomplete"
|
||||
msgstr "Autocomplétion réussite"
|
||||
|
||||
#: pedagogy/templates/pedagogy/uv_edit.jinja:80
|
||||
msgid "An error occured: "
|
||||
msgid "An error occurred: "
|
||||
msgstr "Une erreur est survenue : "
|
||||
|
||||
#: rootplace/templates/rootplace/delete_user_messages.jinja:8
|
||||
@ -5566,7 +5550,7 @@ msgstr "Automne et printemps"
|
||||
|
||||
#: sith/settings.py:448
|
||||
msgid "German"
|
||||
msgstr "Allemant"
|
||||
msgstr "Allemand"
|
||||
|
||||
#: sith/settings.py:449
|
||||
msgid "Spanish"
|
||||
|
||||
@ -76,7 +76,7 @@
|
||||
<p>{{ object.skills|markdown }}</p>
|
||||
<p><b>{% trans %}Key concepts{% endtrans %}</b></p>
|
||||
<p>{{ object.key_concepts|markdown }}</p>
|
||||
<p><b>{% trans %}UV manager: {% endtrans %}</b>{{ object.manager }}</p>
|
||||
<p><b>{% trans %}UE manager: {% endtrans %}</b>{{ object.manager }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block title %}
|
||||
{% trans %}Edit UV{% endtrans %}
|
||||
{% trans %}Edit UE{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>{% trans %}Edit UV{% endtrans %}</h2>
|
||||
<h2>{% trans %}Edit UE{% endtrans %}</h2>
|
||||
<form action="" method="post" enctype="multipart/form-data" id="uv_edit">
|
||||
{% csrf_token %}
|
||||
{{ form.non_field_errors() }}
|
||||
@ -59,7 +59,7 @@
|
||||
url: url,
|
||||
success: function(data, _, xhr) {
|
||||
if (xhr.status != 200) {
|
||||
createQuickNotif("{% trans %}Unknown UV code{% endtrans %}")
|
||||
createQuickNotif("{% trans %}Unknown UE code{% endtrans %}")
|
||||
return
|
||||
}
|
||||
for (let key in data) {
|
||||
@ -77,7 +77,7 @@
|
||||
createQuickNotif('{% trans %}Successful autocomplete{% endtrans %}')
|
||||
},
|
||||
error: function(_, _, statusMessage) {
|
||||
createQuickNotif('{% trans %}An error occured: {% endtrans %}' + statusMessage)
|
||||
createQuickNotif('{% trans %}An error occurred: {% endtrans %}' + statusMessage)
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user