diff --git a/authentication/urls.py b/authentication/urls.py index cabd659..ce006c2 100644 --- a/authentication/urls.py +++ b/authentication/urls.py @@ -9,7 +9,7 @@ urlpatterns = [ { 'template_name': 'authentication/auth_form.html', 'extra_context': { - 'title': 'Login', + 'title': 'Connexion', 'action': 'Login' } }, @@ -27,7 +27,7 @@ urlpatterns = [ { 'template_name': 'authentication/auth_form.html', 'extra_context': { - 'title': 'Change password', + 'title': 'Modifier le mot de passe', 'action': 'Change password' } }, diff --git a/authentication/views.py b/authentication/views.py index 811ef21..7cd72e1 100644 --- a/authentication/views.py +++ b/authentication/views.py @@ -3,5 +3,5 @@ from django.contrib import messages def password_change_done(request): - messages.success(request, "Password changed successfully") + messages.success(request, "Mot de passe modifié avec succès") return render(request, 'refunds/home.html') diff --git a/refunding/forms.py b/refunding/forms.py index f82852a..3b298b9 100644 --- a/refunding/forms.py +++ b/refunding/forms.py @@ -9,7 +9,7 @@ class RefundForm(forms.ModelForm): model = Refund fields = '__all__' - payments = forms.ModelMultipleChoiceField(queryset=Payment.objects.none()) + payments = forms.ModelMultipleChoiceField(queryset=Payment.objects.none(), label='Paiements') def __init__(self, *args, **kwargs): super(RefundForm, self).__init__(*args, **kwargs) diff --git a/refunding/models.py b/refunding/models.py index 0984ec3..7385f2f 100644 --- a/refunding/models.py +++ b/refunding/models.py @@ -9,14 +9,19 @@ AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') class Refund(models.Model): - title = models.CharField(max_length=100) + class Meta: + verbose_name = 'remboursement' + verbose_name_plural = 'remboursements' + + title = models.CharField(max_length=100, verbose_name='titre') date = models.DateField() created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) user = models.ForeignKey( AUTH_USER_MODEL, on_delete=models.PROTECT, - null=True + null=True, + verbose_name='utilisateur' ) def eur_value(self) -> float: @@ -27,28 +32,34 @@ class Refund(models.Model): return 0 def __str__(self) -> str: - return "{0} on {1} for {2:.2f}".format(self.title, self.date, self.eur_value()) + return "{0} le {1} pour {2:.2f}".format(self.title, self.date, self.eur_value()) class Payment(models.Model): - title = models.CharField(max_length=100) + class Meta: + verbose_name = 'paiement' + verbose_name_plural = 'paiements' + + title = models.CharField(max_length=100, verbose_name='titre') date = models.DateField() - value = models.IntegerField() + value = models.IntegerField(verbose_name='valeur') created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) user = models.ForeignKey( AUTH_USER_MODEL, - on_delete=models.PROTECT + on_delete=models.PROTECT, + verbose_name='utilisateur' ) refund = models.ForeignKey( Refund, on_delete=models.SET_NULL, null=True, - blank=True + blank=True, + verbose_name='remboursement' ) def __str__(self) -> str: - s = '{0} on {1} for {2:.2f}'.format(self.title, self.date, self.value / 100) + s = '{0} le {1} pour {2:.2f}'.format(self.title, self.date, self.value / 100) logger.error(s) return s diff --git a/refunding/templates/refunding/elements_list.html b/refunding/templates/refunding/elements_list.html index 6c9f6f1..2e251b9 100644 --- a/refunding/templates/refunding/elements_list.html +++ b/refunding/templates/refunding/elements_list.html @@ -23,6 +23,6 @@ {% else %}
- {% firstof default_nothing "Nothing here..." %} + {% firstof default_nothing "Il n'y a rien ici..." %}
{% endif %} \ No newline at end of file diff --git a/refunding/templates/refunding/payments.html b/refunding/templates/refunding/payments.html index 08c99a5..7f3582e 100644 --- a/refunding/templates/refunding/payments.html +++ b/refunding/templates/refunding/payments.html @@ -3,7 +3,7 @@ {% block content %}This page is under construct and will be updated as soon as possible.
-{% endblock %} diff --git a/refunds/templates/refunds/home.html b/refunds/templates/refunds/home.html index 535855a..b0fae5f 100644 --- a/refunds/templates/refunds/home.html +++ b/refunds/templates/refunds/home.html @@ -3,11 +3,11 @@ {% block title %}Home{% endblock %} {% block content %}Welcome to my refund app!
+Bienvenue sur mon application de remboursements !
{% if not user.is_authenticated %} -You may want to start by logging in.
+Vous voudrez peut-être commencer par vous connecter.
{% else %} -Start by adding a new payment or refunding - some existing payments!
+Commencez par ajouter un nouveau paiement ou par rembourser + des paiements existants
{% endif %} {% endblock %} diff --git a/refunds/urls.py b/refunds/urls.py index 38c776f..ce82ee8 100644 --- a/refunds/urls.py +++ b/refunds/urls.py @@ -21,6 +21,5 @@ urlpatterns = [ url(r'^admin/', admin.site.urls), url(r'^auth/', include('authentication.urls')), url(r'^$', home, name='home'), - url(r'^about/$', about, name='about'), url(r'^', include('refunding.urls')) ] diff --git a/templates/navbar.html b/templates/navbar.html index 9048a02..56248a3 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -15,15 +15,14 @@