Commit a2dc27e6 by Gabe Mulley Committed by Gabe Mulley

fix multi-course emails and update ACE

parent 71ab4ecc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block preview_text %} {% block preview_text %}
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Many {{ platform_name }} learners are completing more problems every week, and Many {{ platform_name }} learners are completing more problems every week, and
participating in the discussion forums. What do you want to do to keep learning? participating in the discussion forums. What do you want to do to keep learning?
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<h1>{% trans "Keep up the momentum!" %}</h1> <h1>{% trans "Keep up the momentum!" %}</h1>
<p> <p>
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Many edX learners are completing more problems every week, and Many edX learners are completing more problems every week, and
participating in the discussion forums. What do you want to do to keep learning? participating in the discussion forums. What do you want to do to keep learning?
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<p> <p>
<!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles --> <!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles -->
<a <a
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
href="{{ dashboard_url }}" href="{{ dashboard_url }}"
{% else %} {% else %}
href="{{ course_url }}" href="{{ course_url }}"
......
{% load i18n %} {% load i18n %}
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Many edX learners are completing more problems every week, and Many edX learners are completing more problems every week, and
participating in the discussion forums. What do you want to do to keep learning? participating in the discussion forums. What do you want to do to keep learning?
......
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{{ platform_name }} {{ platform_name }}
{% else %} {% else %}
{{ course_name }} {{ course_name }}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block preview_text %} {% block preview_text %}
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Remember when you enrolled in {{ course_name }}, and other courses on edX.org? We do, and we’re glad Remember when you enrolled in {{ course_name }}, and other courses on edX.org? We do, and we’re glad
to have you! Come see what everyone is learning. to have you! Come see what everyone is learning.
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<h1>{% trans "Keep learning today" %}.</h1> <h1>{% trans "Keep learning today" %}.</h1>
<p> <p>
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Remember when you enrolled in <strong>{{ course_name }}</strong>, and other courses on edX.org? We do, and we’re glad Remember when you enrolled in <strong>{{ course_name }}</strong>, and other courses on edX.org? We do, and we’re glad
to have you! Come see what everyone is learning. to have you! Come see what everyone is learning.
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<p> <p>
<!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles --> <!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles -->
<a <a
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
href="{{ dashboard_url }}" href="{{ dashboard_url }}"
{% else %} {% else %}
href="{{ course_url }}" href="{{ course_url }}"
......
{% load i18n %} {% load i18n %}
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
Remember when you enrolled in {{ course_name }}, and other courses on edX.org? We do, and we’re glad Remember when you enrolled in {{ course_name }}, and other courses on edX.org? We do, and we’re glad
to have you! Come see what everyone is learning. to have you! Come see what everyone is learning.
......
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{{ platform_name }} {{ platform_name }}
{% else %} {% else %}
{{ course_name }} {{ course_name }}
......
{% load i18n %} {% load i18n %}
{% if courses|length > 1 %} {% if course_ids|length > 1 %}
{% blocktrans %}Keep learning on {{ platform_name }}{% endblocktrans %} {% blocktrans %}Keep learning on {{ platform_name }}{% endblocktrans %}
{% else %} {% else %}
{% blocktrans %}Keep learning in {{course_name}}{% endblocktrans %} {% blocktrans %}Keep learning in {{course_name}}{% endblocktrans %}
......
...@@ -38,7 +38,7 @@ django==1.8.18 ...@@ -38,7 +38,7 @@ django==1.8.18
django-waffle==0.12.0 django-waffle==0.12.0
djangorestframework-jwt==1.11.0 djangorestframework-jwt==1.11.0
enum34==1.1.6 enum34==1.1.6
edx-ace==0.1.4 edx-ace==0.1.5
edx-ccx-keys==0.2.1 edx-ccx-keys==0.2.1
edx-celeryutils==0.2.6 edx-celeryutils==0.2.6
edx-drf-extensions==1.2.3 edx-drf-extensions==1.2.3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment