diff options
| author | Magnus Hagander | 2017-04-16 19:35:59 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2017-04-16 19:35:59 +0000 |
| commit | 09ea014d713f0f99a0775bede416c525bf07c307 (patch) | |
| tree | 3381e603201a216afb1002f345e313853003863d /postgresqleu | |
| parent | 4b62fb65c3eeadc0aafff44c9b1c7585ccbad84d (diff) | |
Code review for making treasurer configurable
Fix some non-python-style syntax, and reintroduce <> around email
addresses that were accidentally removed.
Diffstat (limited to 'postgresqleu')
| -rw-r--r-- | postgresqleu/membership/management/commands/membership_nightly.py | 4 | ||||
| -rw-r--r-- | postgresqleu/membership/views.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/postgresqleu/membership/management/commands/membership_nightly.py b/postgresqleu/membership/management/commands/membership_nightly.py index bf4f67e6..05b92d85 100644 --- a/postgresqleu/membership/management/commands/membership_nightly.py +++ b/postgresqleu/membership/management/commands/membership_nightly.py @@ -33,7 +33,7 @@ class Command(BaseCommand): })) send_simple_mail(settings.MEMBERSHIP_SENDER_EMAIL, m.user.email, - "Your " + settings.ORG_NAME + " membership has expired", + "Your {0} membership has expired".format(settings.ORG_NAME), txt) self.stdout.write(u"Expired member {0} (paid until {1})".format(m, m.paiduntil)) # An expired member has no membersince and no paiduntil. @@ -62,7 +62,7 @@ class Command(BaseCommand): })) send_simple_mail(settings.MEMBERSHIP_SENDER_EMAIL, m.user.email, - "Your " + settings.ORG_NAME + " membership will expire soon", + "Your {0} membership will expire soon".format(settings.ORG_NAME), txt) self.stdout.write(u"Sent warning to member {0} (paid until {1}, last warned {2})".format(m, m.paiduntil, m.expiry_warning_sent)) m.expiry_warning_sent = datetime.now() diff --git a/postgresqleu/membership/views.py b/postgresqleu/membership/views.py index bfcfb5b3..5d3f6500 100644 --- a/postgresqleu/membership/views.py +++ b/postgresqleu/membership/views.py @@ -67,13 +67,13 @@ def home(request): raise Exception("This should not happen - generating invoice when one already exists!") manager = InvoiceManager() processor = InvoiceProcessor.objects.get(processorname="membership processor") - invoicerows = [(settings.ORG_NAME + ' - 2 years membership - %s' % request.user.email, 1, 10, None),] + invoicerows = [('%s - 2 years membership - %s' % (settings.ORG_NAME, request.user.email), 1, 10, None),] member.activeinvoice = manager.create_invoice( request.user, request.user.email, request.user.first_name + ' ' + request.user.last_name, '', # We don't have an address - settings.ORG_NAME + ' membership for %s'% request.user.email, + '%s membership for %s' % (settings.ORG_NAME, request.user.email), datetime.now(), datetime.now(), invoicerows, |