From 4ff1344e6a3a467fc9b21bd0d36b21cdb4cd800c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Mon, 23 Jun 2014 10:06:03 +0200 Subject: [PATCH] =?UTF-8?q?[deconnexion.py]=20On=20arrondit=20=C3=A0=20deu?= =?UTF-8?q?x=20d=C3=A9cimales.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/config/mails/upload.py | 4 ++-- surveillance/deconnexion.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gestion/config/mails/upload.py b/gestion/config/mails/upload.py index 4be66964..29446c91 100644 --- a/gestion/config/mails/upload.py +++ b/gestion/config/mails/upload.py @@ -15,7 +15,7 @@ To: %(to)s Subject: %(proprio)s uploade Content-Type: text/plain; charset="utf-8" -%(proprio)s uploade actuellement %(upload)s Mo. +%(proprio)s uploade actuellement %(upload)s Mio. --\u0020 Message créé par deconnexion.py""" @@ -23,7 +23,7 @@ Message créé par deconnexion.py""" class Message_disconnect_hard(Message): """Envoyé à la ML disconnect@ en cas de dépassement de la limite hard""" template = u"""%(proprio)s (%(id)s) a été limité en débit montant du fait d'un -upload excessif (%(upload)s Mo). +upload excessif (%(upload)s Mio). Ses machines ont été aperçues pour la dernière fois à ces endroits : %(mdc)s diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index b282ffaf..175fe552 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -218,7 +218,7 @@ for elupload, eltype, elid in uploadeurs: ################################ mail = connectsmtp() - corps = mail_module.generate('upload_hard', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string() + corps = mail_module.generate('upload_hard', {'from': upload.expediteur, 'to': proprio.email(), 'upload': "%.2f" % (elupload,), 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string() mail.sendmail(upload.expediteur, proprio.email(), corps) # On envoie un mail à disconnect @@ -228,7 +228,7 @@ for elupload, eltype, elid in uploadeurs: theid = "cid=" else: theid = "aid=" - mail_disconnect_hard = config.mails.upload.Message_disconnect_hard(upload.expediteur, upload.expediteur, proprio=proprio.Nom(), id=theid + proprio.id(), upload=elupload, mdc=mdcf, chambre=proprio.chbre()) + mail_disconnect_hard = config.mails.upload.Message_disconnect_hard(upload.expediteur, upload.expediteur, proprio=proprio.Nom(), id=theid + proprio.id(), upload="%.2f" % (elupload,), mdc=mdcf, chambre=proprio.chbre()) mail_disconnect_hard.send() # Vérification du nombre de déconnexions @@ -276,13 +276,13 @@ for elupload, eltype, elid in uploadeurs: ################################ mail = connectsmtp() - corps = mail_module.generate('upload_soft', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string() + corps = mail_module.generate('upload_soft', {'from': upload.expediteur, 'to': proprio.email(), 'upload': "%.2f" % (elupload,), 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string() mail.sendmail(upload.expediteur, proprio.email(), corps) # On envoie un mail à disconnect ################################ if upload.disconnect_mail_soft: - corps = config.mails.upload.message_disconnect_soft % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': elupload, 'proprio': proprio.Nom()} + corps = config.mails.upload.message_disconnect_soft % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': "%.2f" % (elupload,), 'proprio': proprio.Nom()} corps = corps.encode('utf-8') mail.sendmail(upload.expediteur, upload.expediteur, corps)