heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make translatable takeaway privileges actions

Browse Source
This commit is contained in:
Laura Arjona Reina 2014-07-26 00:50:39 +02:00 committed by Christopher Allan Webber
parent 7f50ae1656
commit a463fe06ed
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediagoblin/moderation/tools.py
View File

@ -31,7 +31,7 @@ def take_punitive_actions(request, form, report, user):
for privilege_name in form.take_away_privileges.data: for privilege_name in form.take_away_privileges.data:
take_away_privileges(user.username, privilege_name) take_away_privileges(user.username, privilege_name)
form.resolution_content.data += \ form.resolution_content.data += \
u"\n{mod} took away {user}\'s {privilege} privileges.".format( _(u"\n{mod} took away {user}\'s {privilege} privileges.").format(
mod=request.user.username, mod=request.user.username,
user=user.username, user=user.username,
privilege=privilege_name) privilege=privilege_name)
@ -44,13 +44,13 @@ def take_punitive_actions(request, form, report, user):
reason=form.why_user_was_banned.data) reason=form.why_user_was_banned.data)
Session.add(user_ban) Session.add(user_ban)
form.resolution_content.data += \ form.resolution_content.data += \
u"\n{mod} banned user {user} {expiration_date}.".format( _(u"\n{mod} banned user {user} {expiration_date}.").format(
mod=request.user.username, mod=request.user.username,
user=user.username, user=user.username,
expiration_date = ( expiration_date = (
"until {date}".format(date=form.user_banned_until.data) _("until {date}").format(date=form.user_banned_until.data)
if form.user_banned_until.data if form.user_banned_until.data
else "indefinitely" else _("indefinitely")
) )
) )
@ -59,7 +59,7 @@ def take_punitive_actions(request, form, report, user):
if u'sendmessage' in form.action_to_resolve.data: if u'sendmessage' in form.action_to_resolve.data:
message_body = form.message_to_user.data message_body = form.message_to_user.data
form.resolution_content.data += \ form.resolution_content.data += \
u"\n{mod} sent a warning email to the {user}.".format( _(u"\n{mod} sent a warning email to the {user}.").format(
mod=request.user.username, mod=request.user.username,
user=user.username) user=user.username)
@ -68,14 +68,14 @@ def take_punitive_actions(request, form, report, user):
deleted_comment = report.comment deleted_comment = report.comment
Session.delete(deleted_comment) Session.delete(deleted_comment)
form.resolution_content.data += \ form.resolution_content.data += \
u"\n{mod} deleted the comment.".format( _(u"\n{mod} deleted the comment.").format(
mod=request.user.username) mod=request.user.username)
elif u'delete' in form.action_to_resolve.data and \ elif u'delete' in form.action_to_resolve.data and \
report.is_media_entry_report(): report.is_media_entry_report():
deleted_media = report.media_entry deleted_media = report.media_entry
deleted_media.delete() deleted_media.delete()
form.resolution_content.data += \ form.resolution_content.data += \
u"\n{mod} deleted the media entry.".format( _(u"\n{mod} deleted the media entry.").format(
mod=request.user.username) mod=request.user.username)
report.archive( report.archive(
resolver_id=request.user.id, resolver_id=request.user.id,