Merge pull request #8268 from edx/sarina/i18n-issues

Use platform name, not edX, in all strings

lms/djangoapps/instructor/paidcourse_enrollment_report.py

@@ -4,9 +4,11 @@ Defines concrete class for cybersource  Enrollment Report.
 """
 from courseware.access import has_access
 import collections
+from django.conf import settings
 from django.utils.translation import ugettext as _
 from courseware.courses import get_course_by_id
 from instructor.enrollment_report import BaseAbstractEnrollmentReportProvider
+from microsite_configuration import microsite
 from shoppingcart.models import RegistrationCodeRedemption, PaidCourseRegistration, CouponRedemption, OrderItem, \
     InvoiceTransaction
 from student.models import CourseEnrollment
@@ -26,7 +28,8 @@ class PaidCourseEnrollmentReportProvider(BaseAbstractEnrollmentReportProvider):
 
         # check the user enrollment role
         if user.is_staff:
-            enrollment_role = _('Edx Staff')
+            platform_name = microsite.get_value('platform_name', settings.PLATFORM_NAME)
+            enrollment_role = _('{platform_name} Staff').format(platform_name=platform_name)
         elif is_course_staff:
             enrollment_role = _('Course Staff')
         else: