From 58073d2fe1e5c90772ecf8061ae911e80f993b3c Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Tue, 12 Jul 2016 11:51:51 -0400 Subject: [PATCH 1/2] small fix to typo in activation email --- themes/edx.org/lms/templates/emails/activation_email.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/edx.org/lms/templates/emails/activation_email.txt b/themes/edx.org/lms/templates/emails/activation_email.txt index 3b912f6fa7..b916c3ca93 100644 --- a/themes/edx.org/lms/templates/emails/activation_email.txt +++ b/themes/edx.org/lms/templates/emails/activation_email.txt @@ -1,6 +1,6 @@ <%! from django.utils.translation import ugettext as _ %> ${_("Thank you for creating an account with {platform_name}!").format(platform_name=settings.PLATFORM_NAME)} -"There’s just one more step before you can enroll in a course: " +${_("There's just one more step before you can enroll in a course: " "You need to activate your {platform_name} account. To activate " "your account, click the following link. If that doesn't work, " "copy and paste the link into your browser's address bar.").format( From 5e6f89b0a918a0ead11a7bf576f7352ecd9c2070 Mon Sep 17 00:00:00 2001 From: Jesse Zoldak Date: Tue, 12 Jul 2016 13:16:21 -0400 Subject: [PATCH 2/2] Mark test for skipping SOL-1811 --- .../acceptance/tests/studio/test_studio_settings_details.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/test/acceptance/tests/studio/test_studio_settings_details.py b/common/test/acceptance/tests/studio/test_studio_settings_details.py index 3ea4c590f9..7ef047b48d 100644 --- a/common/test/acceptance/tests/studio/test_studio_settings_details.py +++ b/common/test/acceptance/tests/studio/test_studio_settings_details.py @@ -49,7 +49,7 @@ class SettingsMilestonesTest(StudioSettingsDetailsTest): self.assertTrue(self.settings_detail.pre_requisite_course_options) - @flaky # SOL-1811 + @skip("Too flaky for the flaky decorator SOL-1811") # SOL-1811 def test_prerequisite_course_save_successfully(self): """ Scenario: Selecting course from Pre-Requisite course drop down save the selected course as pre-requisite