flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

using + for lazy translated strings doesn't work, with a unicode(!) template string % works as expected

Browse Source 
note: with str template string, it doesn't work!
This commit is contained in:
Thomas Waldmann 2015-01-16 13:53:56 +01:00
parent 0d8f6cc82e
commit f6f98e7971
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nsupdate/management/commands/hosts.py
View File

@ -76,10 +76,6 @@ Feel free to re-create it on our service in case you need it again at some
time. time.
""") """)
EMAIL_MSG_STALE = EMAIL_MSG_START + LOG_MSG_STALE + EMAIL_MSG_END
EMAIL_MSG_UNAVAILABLE = EMAIL_MSG_START + LOG_MSG_UNAVAILABLE + EMAIL_MSG_END
EMAIL_MSG_DELETE = EMAIL_MSG_START + LOG_MSG_DELETE + EMAIL_MSG_END_DELETED
def check_staleness(h): def check_staleness(h):
""" """
@ -113,17 +109,20 @@ def check_staleness(h):
staleness = old_staleness + 1 staleness = old_staleness + 1
if staleness >= S_delete: if staleness >= S_delete:
h.delete() h.delete()
EMAIL_MSG_DELETE = u"%s%s%s" % (EMAIL_MSG_START, LOG_MSG_DELETE, EMAIL_MSG_END_DELETED)
email_msg, log_msg = EMAIL_MSG_DELETE, LOG_MSG_DELETE email_msg, log_msg = EMAIL_MSG_DELETE, LOG_MSG_DELETE
elif staleness >= S_unavailable: elif staleness >= S_unavailable:
h.staleness = staleness h.staleness = staleness
h.available = False # TODO remove host from dns also h.available = False # TODO remove host from dns also
h.staleness_notification_timestamp = t_now h.staleness_notification_timestamp = t_now
changed = True changed = True
EMAIL_MSG_UNAVAILABLE = u"%s%s%s" % (EMAIL_MSG_START, LOG_MSG_UNAVAILABLE, EMAIL_MSG_END)
email_msg, log_msg = EMAIL_MSG_UNAVAILABLE, LOG_MSG_UNAVAILABLE email_msg, log_msg = EMAIL_MSG_UNAVAILABLE, LOG_MSG_UNAVAILABLE
else: else:
h.staleness = staleness h.staleness = staleness
h.staleness_notification_timestamp = t_now h.staleness_notification_timestamp = t_now
changed = True changed = True
EMAIL_MSG_STALE = u"%s%s%s" % (EMAIL_MSG_START, LOG_MSG_STALE, EMAIL_MSG_END)
email_msg, log_msg = EMAIL_MSG_STALE, LOG_MSG_STALE email_msg, log_msg = EMAIL_MSG_STALE, LOG_MSG_STALE
if changed: if changed:
h.save() h.save()