crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deconnexion.py] On arrondit à deux décimales.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-06-23 10:06:03 +02:00
parent c7a62df6f6
commit 4ff1344e6a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gestion/config/mails/upload.py
View file

@ -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

8
surveillance/deconnexion.py
View file

@ -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)