From 2e78fce76070a0d11ce32f53ffb5b9408fc6c939 Mon Sep 17 00:00:00 2001 From: Alexander Kryklia <kryklia@gmail.com> Date: Wed, 26 Feb 2014 15:48:28 +0200 Subject: [PATCH] Allow /static in transcript names. --- .../xmodule/video_module/transcripts_utils.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py index b416012d1c9..8815bc0d22e 100644 --- a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py +++ b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py @@ -327,7 +327,10 @@ def manage_video_subtitles_save(item, user, old_metadata=None, generate_translat This whole action ensures that after user changes video fields, proper `sub` files, corresponding to new values of video fields, will be presented in system. - # 2. Generate transcripts translation only when user clicks `save` button, not while switching tabs. + # 2 convert /static/filename.srt to filename.srt in self.transcripts. + (it is done to allow user to enter both /static/filename.srt and filename.srt) + + # 3. Generate transcripts translation only when user clicks `save` button, not while switching tabs. a) delete sjson translation for those languages, which were removed from `item.transcripts`. Note: we are not deleting old SRT files to give user more flexibility. b) For all SRT files in`item.transcripts` regenerate new SJSON files. @@ -358,17 +361,22 @@ def manage_video_subtitles_save(item, user, old_metadata=None, generate_translat ) # 2. + if generate_translation: + for lang, filename in item.transcripts.items(): + item.transcripts[lang] = os.path.split(filename)[-1] + + # 3. if generate_translation: old_langs = set(old_metadata.get('transcripts', {})) if old_metadata else set() new_langs = set(item.transcripts) - for lang in old_langs.difference(new_langs): # 2a + for lang in old_langs.difference(new_langs): # 3a for video_id in possible_video_id_list: if video_id: remove_subs_from_store(video_id, item, lang) reraised_message = '' - for lang in new_langs: # 2b + for lang in new_langs: # 3b try: generate_sjson_for_all_speeds( item, -- GitLab