assume that users are putting caption information in /static/subs. We'll enforce…

assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility

common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee

@@ -10,7 +10,7 @@ class @VideoCaption extends Subview
       .bind('DOMMouseScroll', @onMovement)
 
   captionURL: ->
-    "#{@captionAssetPath}/#{@youtubeId}.srt.sjson"
+    "#{@captionAssetPath}#{@youtubeId}.srt.sjson"
 
   render: ->
     # TODO: make it so you can have a video with no captions.

common/lib/xmodule/xmodule/video_module.py

@@ -97,11 +97,11 @@ class VideoModule(XModule):
 
     def get_html(self):
         if isinstance(modulestore(), MongoModuleStore) :
-            caption_asset_path = StaticContent.get_base_url_path_for_course_assets(self.location)
+            caption_asset_path = StaticContent.get_base_url_path_for_course_assets(self.location) + '/subs_'
         else:
             # VS[compat]
             # cdodge: filesystem static content support.
-            caption_asset_path = "/static/{0}/subs".format(self.metadata['data_dir'])
+            caption_asset_path = "/static/{0}/subs/".format(self.metadata['data_dir'])
 
         return self.system.render_template('video.html', {
             'streams': self.video_list(),