From d6d5eadb6ec4e80c01be35f215538cf9eaa6d416 Mon Sep 17 00:00:00 2001 From: dzhuang Date: Thu, 7 Apr 2016 19:45:01 +0800 Subject: [PATCH] fixed bugs: no user name in grade-notify email. --- course/templates/course/grade-notify.txt | 6 ++---- locale/zh_CN/LC_MESSAGES/django.po | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/course/templates/course/grade-notify.txt b/course/templates/course/grade-notify.txt index a71faecd..bfb9b97a 100644 --- a/course/templates/course/grade-notify.txt +++ b/course/templates/course/grade-notify.txt @@ -1,8 +1,6 @@ -{% load i18n %}{% blocktrans trimmed with username=user.get_email_appellation %}Dear {{username}},{% endblocktrans %} +{% load i18n %}{% blocktrans trimmed with username=participation.user.get_email_appellation %}Dear {{username}},{% endblocktrans %} {% blocktrans with flow_id=flow_session.flow_id flow_id=flow_session.flow_id course_identifier=course.identifier feedback_text=feedback_text|safe %} -You have a new notification regarding your work on the page with title -'{{ page_title }}' in '{{ flow_id }}' of '{{ course_identifier }}'. The -full text of the feedback follows. +You have a new notification regarding your work on the page with title '{{ page_title }}' in '{{ flow_id }}' of '{{ course_identifier }}'. The full text of the feedback follows. ------------------------------------------------------------------- {{ feedback_text }} ------------------------------------------------------------------- diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 0d8f4e19..cd8c82db 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -4025,8 +4025,8 @@ msgstr "提交并转到下一个session" #, python-format msgid "" "\n" -"You have a new notification regarding your work on the page with title\n" -"'%(page_title)s' in '%(flow_id)s' of '%(course_identifier)s'. The\n" +"You have a new notification regarding your work on the page with title '%" +"(page_title)s' in '%(flow_id)s' of '%(course_identifier)s'. The " "full text of the feedback follows.\n" "-------------------------------------------------------------------\n" "%(feedback_text)s\n" @@ -4036,7 +4036,7 @@ msgid "" "\n" msgstr "" "\n" -" 您有一个新的通知, 是关于您在标题为%(page_title)s的页面的回答(%" +" 您有一个新的通知，是关于您在标题为%(page_title)s的页面的回答(%" "(course_identifier)s课程的%(flow_id)s). 反馈信息的全文如下：\n" "-------------------------------------------------------------------\n" "%(feedback_text)s\n" -- GitLab