Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py

lms/djangoapps/courseware/tests/test_video_handlers.py

@@ -437,6 +437,42 @@ class TestTranscriptTranslationGetDispatch(TestVideo):
         response = self.item.transcript(request=request, dispatch='translation/uk')
         self.assertEqual(response.status, '404 Not Found')
 
+    def test_xml_transcript(self):
+        """
+        Set data_dir and remove runtime modulestore to simulate an XMLModuelStore course.
+        Then run the same tests as static_asset_path run.
+        """
+        # Simulate XMLModuleStore xmodule
+        self.item_descriptor.data_dir = 'dummy/static'
+        del self.item_descriptor.runtime.modulestore
+
+        self.assertFalse(self.course.static_asset_path)
+
+        # Test youtube style en
+        request = Request.blank('/translation/en?videoId=12345')
+        response = self.item.transcript(request=request, dispatch='translation/en')
+        self.assertEqual(response.status, '307 Temporary Redirect')
+        self.assertIn(
+            ('Location', '/static/dummy/static/subs_12345.srt.sjson'),
+            response.headerlist
+        )
+
+        # Test HTML5 video style
+        self.item.sub = 'OEoXaMPEzfM'
+        request = Request.blank('/translation/en')
+        response = self.item.transcript(request=request, dispatch='translation/en')
+        self.assertEqual(response.status, '307 Temporary Redirect')
+        self.assertIn(
+            ('Location', '/static/dummy/static/subs_OEoXaMPEzfM.srt.sjson'),
+            response.headerlist
+        )
+
+        # Test different language to ensure we are just ignoring it since we can't
+        # translate with static fallback
+        request = Request.blank('/translation/uk')
+        response = self.item.transcript(request=request, dispatch='translation/uk')
+        self.assertEqual(response.status, '404 Not Found')
+
 
 class TestStudioTranscriptTranslationGetDispatch(TestVideo):
     """