github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 15:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused i18n email code

Browse Source
This commit is contained in:
Keith Mitchell
2012-09-07 11:17:51 -07:00
parent b832496391
commit b29f09ac03
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/controllers/api.py
View File

@@ -145,7 +145,7 @@ class ApiController(RedditController, OAuth2ResourceController):
@validatedForm(VCaptcha(),
name=VRequired('name', errors.NO_NAME),
email=ValidEmails('email', num = 1),
reason = VOneOf('reason', ('ad_inq', 'feedback', "i18n")),
reason = VOneOf('reason', ('ad_inq', 'feedback')),
message=VRequired('text', errors.NO_TEXT),
)
def POST_feedback(self, form, jquery, name, email, reason, message):
@@ -156,8 +156,6 @@ class ApiController(RedditController, OAuth2ResourceController):
if reason == 'ad_inq':
emailer.ad_inq_email(email, message, name, reply_to = '')
elif reason == 'i18n':
emailer.i18n_email(email, message, name, reply_to = '')
else:
emailer.feedback_email(email, message, name, reply_to = '')
form.set_html(".status", _("thanks for your message! "

5
r2/r2/lib/emailer.py
View File

@@ -115,11 +115,6 @@ def ad_inq_email(email, body, name='', reply_to = ''):
return _feedback_email(email, body, Email.Kind.ADVERTISE, name = name,
reply_to = reply_to)
def i18n_email(email, body, name='', reply_to = ''):
"""Queues a ad_inq email to the feedback account."""
return _feedback_email(email, body, Email.Kind.HELP_TRANSLATE, name = name,
reply_to = reply_to)
def gold_email(body, to_address, from_name=g.domain):
return _gold_email(body, to_address, from_name, Email.Kind.GOLDMAIL)

2
r2/r2/models/mail_queue.py
View File

@@ -301,7 +301,6 @@ class Email(object):
"LIVE_PROMO",
"FINISHED_PROMO",
"NEW_PROMO",
"HELP_TRANSLATE",
"NERDMAIL",
"GOLDMAIL",
)
@@ -321,7 +320,6 @@ class Email(object):
Kind.LIVE_PROMO : _("[reddit] your promotion is now live"),
Kind.FINISHED_PROMO : _("[reddit] your promotion has finished"),
Kind.NEW_PROMO : _("[reddit] your promotion has been created"),
Kind.HELP_TRANSLATE : _("[i18n] translation offer from '%(user)s'"),
Kind.NERDMAIL : _("[reddit] hey, nerd!"),
Kind.GOLDMAIL : _("[reddit] reddit gold activation link")
}