From 65a8a1e0c7a60b40bf691ad2b928c29182569255 Mon Sep 17 00:00:00 2001 From: Lazare Olivry Date: Tue, 21 Aug 2018 14:04:10 +0200 Subject: [PATCH] update code after rebase --- logs/templates/logs/aff_stats_rooms.html | 2 +- logs/templates/logs/stats_rooms.html | 4 ++-- logs/views.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/logs/templates/logs/aff_stats_rooms.html b/logs/templates/logs/aff_stats_rooms.html index 63842b84..254a0958 100644 --- a/logs/templates/logs/aff_stats_rooms.html +++ b/logs/templates/logs/aff_stats_rooms.html @@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

on met un {{ key_dict }} de {{ key }}

{{ key_dict }} - Nombre de {{ key }} par {{ key_dict }} + Number of {{ key }} per {{ key_dict }} Rang diff --git a/logs/templates/logs/stats_rooms.html b/logs/templates/logs/stats_rooms.html index 49284096..7efb51e0 100644 --- a/logs/templates/logs/stats_rooms.html +++ b/logs/templates/logs/stats_rooms.html @@ -25,10 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} -{% block title %}Chambres innocupées{% endblock %} +{% block title %}Unoccupied rooms{% endblock %} {% block content %} -

Chambres innocupées

+

Unoccupied rooms

{% include "logs/aff_stats_rooms.html" with stats_list=stats_list %}

diff --git a/logs/views.py b/logs/views.py index e8c30718..ae45bd91 100644 --- a/logs/views.py +++ b/logs/views.py @@ -529,11 +529,11 @@ def stats_unoccupied_rooms(request): """Vue qui affiche les chambres inoccupées pour des fins de contrôle des cotisations""" stats = { - 'Nombre de chambres Innocupées': { - 'Action': Room.objects.filter(adherent__isnull=True).count() + _("Unoccupied rooms count"): { + _("Action"): Room.objects.filter(adherent__isnull=True).count() }, - 'Chambres Innocupées': { - 'Action': Room.objects.filter( + _("Unoccupied rooms"): { + _("Action"): Room.objects.filter( adherent__isnull=True ).order_by('-num')[:40], },