jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Suppression Kfet et traduction (+fix notequal)

Browse source
This commit is contained in:
Jean-Baptiste Doderlein 2023-11-08 10:58:23 +01:00
parent b280647c35
commit 55417313c0
14 changed files with 6844 additions and 3276 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/member/templates/member/profile_trust.html
View file

@ -28,7 +28,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% blocktrans trimmed %}
Adding someone as a friend enables them to initiate transactions coming
from your account (while keeping your balance positive). This is
designed to simplify using note kfet transfers to transfer money between
designed to simplify using note ker lann transfers to transfer money between
users. The intent is that one person can make all transfers for a group of
friends without needing additional rights among them.
{% endblocktrans %}

6
apps/note/templates/note/mails/negative_balance.html
View file

@ -14,7 +14,7 @@
</p>
<p>
Ce mail t'a été envoyé parce que le solde de ta Note Kfet {{ note }} est négatif !
Ce mail t'a été envoyé parce que le solde de ta Note Ker Lann {{ note }} est négatif !
</p>
<p>
@ -32,7 +32,7 @@
</p>
<p>
Tu peux venir recharger ta note rapidement à la Kfet, ou envoyer un mail à
Tu peux venir recharger ta note rapidement, ou envoyer un mail à
la trésorerie du BdE (<a href="mailto:tresorerie.bde@lists.crans.org">tresorerie.bde@lists.crans.org</a>)
pour payer par virement bancaire.
</p>
@ -40,7 +40,7 @@
--
<p>
Le BDE<br>
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
{% trans "Mail generated by the Note Ker Lann on the" %} {% now "j F Y à H:i:s" %}
</p>
</body>
</html>

4
apps/note/templates/note/mails/negative_notes_report.html
View file

@ -5,7 +5,7 @@
<html lang="fr">
<head>
<meta charset="UTF-8">
<title>[Note Kfet] Liste des négatifs</title>
<title>[Note Ker Lann] Liste des négatifs</title>
</head>
<body>
<table>
@ -43,7 +43,7 @@
--
<p>
Le BDE<br>
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
{% trans "Mail generated by the Note Ker Lann on the" %} {% now "j F Y à H:i:s" %}
</p>
</body>
</html>

4
apps/note/templates/note/mails/weekly_report.html
View file

@ -8,7 +8,7 @@
<html lang="fr">
<head>
<meta charset="UTF-8">
<title>[Note Kfet] Rapport de la Note Kfet</title>
<title>[Note Ker Lann] Rapport de la Note Ker Lann</title>
<link rel="stylesheet" href="https://{{ "NOTE_URL"|getenv }}{% static "bootstrap4/css/bootstrap.min.css" %}">
<script src="https://{{ "NOTE_URL"|getenv }}{% static "bootstrap4/js/bootstrap.min.js" %}"></script>
@ -48,7 +48,7 @@
--
<p>
Le BDE<br>
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
{% trans "Mail generated by the Note Ker Lann on the" %} {% now "j F Y à H:i:s" %}
</p>
</body>
</html>

2
apps/registration/templates/registration/email_validation_complete.html
View file

@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
</p>
{% else %}
<p>
{% trans "You must pay now your membership in the Kfet to complete your registration." %}
{% trans "You must pay now your membership to complete your registration." %}
</p>
{% endif %}
{% else %}

2
apps/registration/templates/registration/email_validation_email_sent.html
View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% trans "An email has been sent. Please click on the link to activate your account." %}
</p>
<p>
{% trans "You must also go to the Kfet to pay your membership." %}
{% trans "You must also pay your membership. A administrator will then activate your account" %}
</p>
</div>
</div>

10
apps/registration/templates/registration/mails/email_validation_email.html
View file

@ -4,7 +4,7 @@
<html lang="fr">
<head>
<meta charset="UTF-8">
<title>Passage en négatif (compte n°{{ note.user.pk }})</title>
<title>{% trans "Activation of your Note Ker Lann account" %}</title>
</head>
<body>
@ -13,7 +13,7 @@
</p>
<p>
{% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %}
{% trans "You recently registered on the Note Ker Lann. Please click on the link below to confirm your registration." %}
</p>
<p>
@ -27,7 +27,7 @@
</p>
<p>
{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet." %}
{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership." %}
</p>
<p>
@ -36,6 +36,6 @@
--
<p>
{% trans "The Note Kfet team." %}<br>
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
{% trans "The Note Ker Lann team." %}<br>
{% trans "Mail generated by the Note Ker Lann on the" %} {% now "j F Y à H:i:s" %}
</p>

8
apps/registration/templates/registration/mails/email_validation_email.txt
View file

@ -2,15 +2,15 @@
{% trans "Hi" %} {{ user.username }},
{% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %}
{% trans "You recently registered on the Note Ker Lann. Please click on the link below to confirm your registration." %}
https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}
{% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %}
{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet." %}
{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership." %}
{% trans "Thanks" %},
{% trans "The Note Kfet team." %}
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
{% trans "The Note Ker Lann team." %}
{% trans "Mail generated by the Note Ker Lann on the" %} {% now "j F Y à H:i:s" %}

3329
locale/de/LC_MESSAGES/django.po
View file

File diff suppressed because it is too large Load diff

3413
locale/es/LC_MESSAGES/django.po
View file

File diff suppressed because it is too large Load diff

3327
locale/fr/LC_MESSAGES/django.po
View file

File diff suppressed because it is too large Load diff

9
note_kfet/templates/autocomplete_model.html
View file

@ -7,8 +7,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
<input type="text"
{% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
name="{{ widget.name }}_name" autocomplete="off"
{% for name, value in widget.attrs.items %}
{% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
{% for name, value in widget.attrs.items %}
{% if value != False %}
{{ name }}
{% if value != True %}
="{{ value|stringformat:'s' }}"
{% endif %}
{% endif %}
{% endfor %}
aria-describedby="{{widget.attrs.id}}_tooltip">
{% if widget.resetable %}

2
note_kfet/templates/base.html
View file

@ -66,7 +66,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-coffee"></i> {% trans 'Consumptions' %}</a>
</li>
{% endif %}
{% if user.is_authenticated and user|is_member:"Kfet" %}
{% if user.is_authenticated and user|is_member:"Sinfonie" %}
<li class="nav-item">
{% url 'note:transfer' as url %}
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %} </a>

2
note_kfet/templates/registration/signup.html
View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="alert alert-warning">
{% blocktrans trimmed %}
If you already signed up, your registration is taken into account. The BDE must validate
your account before your can log in. You have to go to the Kfet and pay the registration fee. You must also
your account before your can log in. You have to pay the registration fee. You must also
validate your email address by following the link you received.
{% endblocktrans %}
</div>