Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/lib/xmodule/xmodule/modulestore/inheritance.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ class InheritanceMixin(XBlockMixin):
scope=Scope.settings
)
video_bumper = Dict(
display_name=_("Video Bumper"),
display_name=_("Video Pre-Roll"),
help=_(
"""Identify a video, 5-15 seconds in length, to play before course videos. Enter the video ID from"""
"""Identify a video, 5-10 seconds in length, to play before course videos. Enter the video ID from"""
""" the Video Uploads page and one or more transcript files in the following format:"""
""" {"video_id": "ID", "transcripts": {"language": "filename.srt"}}."""
""" For example, an entry for a video with two transcripts looks like this:"""
Expand Down
2 changes: 1 addition & 1 deletion common/test/acceptance/pages/lms/video/video.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def _is_finished_loading():
@wait_for_js
def wait_for_video_bumper_render(self):
"""
Wait until Poster, Video Bumper and main Video Player are Rendered Completely.
Wait until Poster, Video Pre-Roll and main Video Player are Rendered Completely.
"""
self.wait_for_video_class()
self.wait_for_element_presence(CSS_CLASS_NAMES['video_init'], 'Video Player Initialized')
Expand Down