Skip to content

C
course-discovery
Commit b6fbe923 by Sylvia Pearce Committed by Awais Qureshi
Options

Text changes in publisher app. 

DOC-3659
parent 40b87e03
Showing with 150 additions and 110 deletions
course_discovery/apps/publisher/forms.py
......@@ -141,7 +141,7 @@ class CustomCourseForm(CourseForm):
)
expected_learnings = forms.CharField(
label=_('What you will learn'), widget=forms.Textarea, required=False,
label=_('What You Will Learn'), widget=forms.Textarea, required=False,
validators=[validate_text_count(max_length=2500)]
)
......@@ -292,7 +292,7 @@ class CustomCourseRunForm(CourseRunForm):
xseries_name = forms.CharField(label=_('XSeries Name'), required=False)
professional_certificate_name = forms.CharField(label=_('Professional Certificate Name'), required=False)
micromasters_name = forms.CharField(label=_('MicroMasters Name'), required=False)
lms_course_id = forms.CharField(label=_('Course Run Key'), required=False)
lms_course_id = forms.CharField(label=_('Studio URL'), required=False)
video_language = forms.ModelChoiceField(
queryset=LanguageTag.objects.all(),
label=_('Video Language'),
......@@ -437,14 +437,14 @@ class CustomSeatForm(SeatForm):
self.fields['type'].widget.attrs = {'class': field_classes}
TYPE_CHOICES = [
('', _('Choose course type')),
(Seat.AUDIT, _('Audit Only')),
(Seat.VERIFIED, _('Verified Certificate')),
(Seat.PROFESSIONAL, _('Professional Education')),
('', _('Choose enrollment track')),
(Seat.AUDIT, _('Audit only')),
(Seat.VERIFIED, _('Verified')),
(Seat.PROFESSIONAL, _('Professional education')),
(Seat.CREDIT, _('Credit')),
]
type = forms.ChoiceField(choices=TYPE_CHOICES, required=False, label=_('Seat Type'))
type = forms.ChoiceField(choices=TYPE_CHOICES, required=False, label=_('Enrollment Track'))
price = forms.DecimalField(max_digits=6, decimal_places=2, required=False, initial=0.00)
credit_price = forms.DecimalField(max_digits=6, decimal_places=2, required=False, initial=0.00)
......
course_discovery/apps/publisher/tests/test_views.py
......@@ -1729,9 +1729,9 @@ class CourseDetailViewTests(TestCase):
response = self.client.get(self.detail_page_url)
self.assertContains(response, 'COURSE RUNS')
self.assertContains(response, 'ADD RUN')
self.assertContains(response, 'CREATE RUN')
self.assertContains(response, 'STUDIO URL -')
self.assertContains(response, 'Not yet created')
self.assertContains(response, 'To be added by edX')
self.assertContains(response, reverse('publisher:publisher_course_run_detail', kwargs={'pk': course_run.id}))
def test_detail_page_data(self):
......@@ -2363,7 +2363,7 @@ class CourseEditViewTests(TestCase):
post_data['title'] = ''
response = self.client.post(self.edit_page_url, data=post_data)
self.assertContains(response, 'Please fill all required fields.')
self.assertContains(response, 'The page could not be updated. Make sure that')
def test_text_area_max_length_error(self):
"""
......@@ -2705,7 +2705,7 @@ class CourseRunEditViewTests(TestCase):
"""
response = self.client.get(self.edit_page_url)
self.assertContains(response, 'Course Run Key')
self.assertContains(response, 'Studio URL')
self.assertContains(response, 'name="lms_course_id"')
self.updated_dict['lms_course_id'] = 'course-v1:edxTest+Test342+2016Q1'
......@@ -2775,7 +2775,7 @@ class CourseRunEditViewTests(TestCase):
self.assertContains(response, '<input id="id_lms_course_id" name="lms_course_id" type="hidden"')
self.assertContains(response, 'Course Run Key')
self.assertContains(response, 'Studio URL')
self.assertContains(response, 'STUDIO URL')
self.assertContains(response, 'Not yet created')
......@@ -3096,7 +3096,7 @@ class CreateRunFromDashboardViewTests(TestCase):
post_data = self._post_data()
post_data.pop('course')
response = self.client.post(self.create_course_run_url, post_data)
self.assertContains(response, 'Please fill all required fields.', status_code=400)
self.assertContains(response, 'The page could not be updated. Make', status_code=400)
def test_create_course_run_and_seat(self):
""" Verify that we can create a new course run with seat. """
......
course_discovery/apps/publisher/views.py
......@@ -299,10 +299,8 @@ class CreateCourseView(mixins.LoginRequiredMixin, mixins.PublisherUserRequiredMi
messages.success(
request, _(
"You have successfully created a course. You can edit the course information or enter "
"information for the course About page at any time. "
"An edX project coordinator will create a Studio instance for this course. When you "
"receive an email notification that the Studio instance is ready, you can enter course "
"content in Studio."
"information for the course About page at any time before you send the course to"
" edX marketing for review. "
)
)
......@@ -313,7 +311,9 @@ class CreateCourseView(mixins.LoginRequiredMixin, mixins.PublisherUserRequiredMi
messages.error(request, error_message)
if not messages.get_messages(request):
messages.error(request, _('Please fill all required fields.'))
messages.error(
request, _('The page could not be updated. Make sure that all values are correct, then try again.')
)
if course_form.errors.get('image'):
messages.error(request, course_form.errors.get('image'))
......@@ -418,7 +418,9 @@ class CourseEditView(mixins.PublisherPermissionMixin, UpdateView):
def form_invalid(self, form):
# pylint: disable=no-member
messages.error(self.request, _('Please fill all required fields.'))
messages.error(
self.request, _('The page could not be updated. Make sure that all values are correct, then try again.')
)
return self.render_to_response(self.get_context_data(form=form))
......@@ -595,7 +597,7 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, CreateView):
CourseRunState.objects.create(course_run=course_run, owner_role=PublisherUserRole.CourseTeam)
# pylint: disable=no-member
success_msg = _('Course run created successfully for course "{course_title}".').format(
success_msg = _('You have successfully created a course run for {course_title}.').format(
course_title=parent_course.title
)
messages.success(request, success_msg)
......@@ -604,12 +606,13 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, CreateView):
return HttpResponseRedirect(reverse(self.success_url, kwargs={'pk': course_run.id}))
except Exception as error: # pylint: disable=broad-except
# pylint: disable=no-member
error_msg = _('There was an error saving course run, {error}').format(error=error)
error_msg = _('There was an error saving this course run: {error}').format(error=error)
messages.error(request, error_msg)
logger.exception('Unable to create course run and seat for course [%s].', parent_course.id)
else:
messages.error(request, _('Please fill all required fields.'))
messages.error(
request, _('The page could not be updated. Make sure that all values are correct, then try again.')
)
else:
messages.error(
request,
......@@ -651,7 +654,9 @@ class CreateRunFromDashboardView(CreateCourseRunView):
self.parent_course = course_form.cleaned_data.get('course')
return super(CreateRunFromDashboardView, self).post(request, *args, **kwargs)
messages.error(request, _('Please fill all required fields.'))
messages.error(
request, _('The page could not be updated. Make sure that all values are correct, then try again.')
)
context = self.get_context_data()
context.update(
{
......@@ -768,8 +773,9 @@ class CourseRunEditView(mixins.LoginRequiredMixin, mixins.PublisherPermissionMix
logger.exception('Unable to update course run and seat for course [%s].', course_run.id)
if not messages.get_messages(request):
messages.error(request, _('Please fill all required fields.'))
messages.error(
request, _('The page could not be updated. Make sure that all values are correct, then try again.')
)
context.update(
{
'run_form': run_form,
......
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-08 18:57+0500\n"
"POT-Creation-Date: 2017-06-09 21:46+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -76,7 +76,7 @@ msgstr ""
#: static/js/publisher/views/dashboard.js
msgid ""
"You have successfully created a studio instance ({studioLinkTag}) for "
"You have successfully created a Studio URL ({studioLinkTag}) for "
"{courseRunDetail} with a start date of {startDate}"
msgstr ""
......
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-08 18:57+0500\n"
"POT-Creation-Date: 2017-06-09 21:46+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -85,12 +85,12 @@ msgstr "Pléäsé éntér ä välïd ÛRL. Ⱡ'σяєм ιρѕυм ∂σłσя
#: static/js/publisher/views/dashboard.js
msgid ""
"You have successfully created a studio instance ({studioLinkTag}) for "
"You have successfully created a Studio URL ({studioLinkTag}) for "
"{courseRunDetail} with a start date of {startDate}"
msgstr ""
"Ýöü hävé süççéssfüllý çréätéd ä stüdïö ïnstänçé ({studioLinkTag}) för "
"Ýöü hävé süççéssfüllý çréätéd ä Stüdïö ÛRL ({studioLinkTag}) för "
"{courseRunDetail} wïth ä stärt däté öf {startDate} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
"αмєт, ¢σηѕє¢#"
"αмєт, ¢σηѕє¢тє#"
#: static/js/publisher/views/dashboard.js
msgid "There was an error in saving your data."
......
course_discovery/static/js/publisher/views/dashboard.js
......@@ -20,7 +20,7 @@ $(document).ready(function() {
$studioInstanceSuccess = $(".studio-instance-success"),
$studioInstanceError = $(".studio-instance-error"),
successMessage = interpolateString(
gettext("You have successfully created a studio instance ({studioLinkTag}) for {courseRunDetail} with a start date of {startDate}"),
gettext("You have successfully created a Studio URL ({studioLinkTag}) for {courseRunDetail} with a start date of {startDate}"),
{
"studioLinkTag": "<a href=''>"+ courseKeyValue +"</a>",
"courseRunDetail": courseTitleTag,
......
course_discovery/templates/publisher/_approval_widget.html
......@@ -59,7 +59,7 @@
<input id="id-review-url" type="text">
<span class="error-message"></span>
{% else %}
<span>{% trans "About page preview not available" %}</span>
<span>{% trans "Not available" %}</span>
{% endif %}
{% endif %}
</div>
......
course_discovery/templates/publisher/add_course_form.html
......@@ -132,7 +132,6 @@
</div>
</div>
</div>
<div class="course-form">
<div class="course-information action-buttons">
<div class="field">
......
course_discovery/templates/publisher/add_courserun_form.html
......@@ -103,8 +103,7 @@
{{ run_form.end }}
</div>
</div>
<div class="field-title">{% trans "CERTIFICATE TYPE AND PRICE" %} <span class="optional float-right">Optional</span></div>
<div class="field-title">{% trans "CERTIFICATE TYPE AND PRICE" %}</div>
<div class="row">
<div class="col col-6 help-text">
{% trans "If the course offers a verified or professional education certificate, select the certificate type and enter the price for the certificate." %}
......
course_discovery/templates/publisher/course_detail/_widgets.html
......@@ -8,7 +8,7 @@
<div>
<h5 class="hd-5 emphasized course-runs-heading">{% trans "COURSE RUNS" %}</h5>
<a href="{% url 'publisher:publisher_course_runs_new' parent_course_id=object.id %}" class="btn btn-brand btn-small btn-courserun-add">
{% trans "ADD RUN" %}
{% trans "CREATE RUN" %}
</a>
</div>
<div class="course-run-list">
......@@ -31,7 +31,7 @@
{% if course_run.studio_url %}
<a class="studio-link" href="{{ course_run.studio_url }}" target="_blank">{{ course_run.lms_course_id }}</a>
{% else %}
{% trans "Not yet created" %}
{% trans "To be added by edX" %}
{% endif %}
</div>
</div>
......
course_discovery/templates/publisher/course_edit_form.html
......@@ -26,7 +26,11 @@
{% endfor %}
{% endif %}
<p>
{% trans "All required fields must be complete before this course can be sent for review." %}
{% trans "All required fields must be complete before this course can be sent to edX marketing for review." %}
</p>
<p>
<strong>{% trans "Note:" %}</strong>
{% trans "If you edit course information after edX marketing has reviewed the course, you have to send the course for review again." %}
</p>
<form id="frm_course_edit" class="form" method="post" action="" enctype="multipart/form-data">{% csrf_token %}
<input id="id_history_revision" type="hidden" value="{{ history_object.id }}">
......
course_discovery/templates/publisher/course_run/edit_run_form.html
......@@ -91,7 +91,7 @@
<div class="field-title">{% trans "STUDIO URL" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
<p>{% trans "The Studio URL for this course run." %}</p>
<p>{% trans "The Studio URL for this course run. The edX PC creates this URL." %}</p>
</div>
<div class="col col-6">
<label class="field-label ">{{ run_form.lms_course_id.label_tag }} <span class="required">*</span></label>
......
course_discovery/templates/publisher/course_run_detail/_all.html
......@@ -10,7 +10,7 @@
{% if object.studio_url %}
<a target="_blank" href="{{ object.studio_url }}">{{ object.lms_course_id }}</a>
{% else %}
{% trans "(Required) Not yet added" %}
{% trans "(Required) To be added by edX" %}
{% endif %}
</div>
</div>
......@@ -31,7 +31,7 @@
<div class="info-item">
<div class="heading">
{% trans "Certificate Type" %}
{% trans "Enrollment Track" %}
</div>
<div>{{ object.course_type }}</div>
</div>
......@@ -146,7 +146,7 @@
<div class="info-item">
<div class="heading">
{% trans "MicroMasters" %}
{% trans "MicroMasters Program Name" %}
</div>
<div>
{% with object.micromasters_name as field %}
......@@ -157,7 +157,7 @@
<div class="info-item">
<div class="heading">
{% trans "XSeries Name" %}
{% trans "XSeries Program Name" %}
</div>
<div>
{% with object.xseries_name as field %}
......@@ -168,7 +168,7 @@
<div class="info-item">
<div class="heading">
{% trans "Professional Certificate Name" %}
{% trans "Professional Certificate Program Name" %}
</div>
<div>
{% with object.professional_certificate_name as field %}
......
course_discovery/templates/publisher/course_run_detail/_preview_accept_popup.html
......@@ -2,10 +2,13 @@
<div id="acceptPreviewModal" class="modal">
<div class="modal-content">
<h2 class="hd-2 emphasized accept-preview-heading">{% trans "Publish Course Run" %}</h2>
<h2 class="hd-2 emphasized accept-preview-heading">{% trans "Accept About Page Preview" %}</h2>
<div id="modal-errors" class="alert-messages"></div>
<p>
{% trans "Before the About page for this course run can be published, the following information for the course run must be entered in Studio." %}
{% trans "By accepting the About page preview, you are confirming that the information for this course run in Publisher is correct." %}
</p>
<p>
{% trans "Note that before edX can publish the About page for this course run, the following information for the course run must be entered in Studio." %}
</p>
<ul>
<li>{% trans "The course run start and end date." %}</li>
......@@ -14,7 +17,7 @@
</ul>
<div class="actions">
<a class="btn-cancel closeModal" href="#">{% trans "Cancel" %}</a>
<button class="btn-brand btn-base btn-accept" type="button" data-url="{% url 'publisher:api:change_course_run_state' object.course_run_state.id %}">{% trans "Yes" %}</button>
<button class="btn-brand btn-base btn-accept" type="button" data-url="{% url 'publisher:api:change_course_run_state' object.course_run_state.id %}">{% trans "OK" %}</button>
</div>
</div>
</div>
course_discovery/templates/publisher/dashboard.html
......@@ -8,9 +8,7 @@
{% block page_content %}
<div class="about-and-add-buttons clearfix">
<h2 class="hd-2 emphasized">{% trans "Course About Pages" %}</h2>
<div class="col-60 float-left">
<p class="about-publisher">{% trans "EdX Publisher is used to create course About pages. Users enter, review, and approve content in Publisher. Publisher keeps track of the details and sends email updates when actions are necessary." %}</p>
<p>{% trans "EdX Publisher is a companion to edX Studio. Course teams enter About page information in Publisher, and course content in Studio." %}</p>
......
course_discovery/templates/publisher/dashboard/_in_preview.html
......@@ -3,7 +3,7 @@
<div class="empty-courserun-text">{% trans "No course runs currently have an About page preview available for course team review." %}</div>
{% else %}
<p>
{% trans "About page previews for the following course runs are available for course team review. After the course team approves the preview, the edX marketing team will publish the About page for the course run on edx.org. The course team will receive an email message when the About page has been published." %}
{% trans "About page previews for the following course runs are available for course team review. After the course team approves the preview, the edX publisher will publish the About page for the course run on edx.org. The course team will receive an email message when the About page has been published." %}
</p>
<div class="table-view">
<table class="data-table-preview display" cellspacing="0" width="100%">
......
course_discovery/templates/publisher/email/studio_instance_created.html
......@@ -10,7 +10,7 @@
{% endblocktrans %}
<p>
{% blocktrans trimmed %}
{{ project_coordinator_name }} has created a Studio URL for the {{ course_run }} course run of {{ course_name }}. You can now take either of the following actions.
{{ project_coordinator_name }} has created a Studio URL for the {{ course_run }}. You can now take either of the following actions.
{% endblocktrans %}
</p>
<ul>
......
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