Merge pull request #6224 from edx/release

hotfix-2014-12-11
2014-12-11 13:23:37 -05:00
parent 4f823396ed 5f8d6261d9
commit b1e5002b6b
2 changed files with 54 additions and 12 deletions
--- a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
+++ b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
@@ -532,10 +532,10 @@ class VideoTranscriptsMixin(object):

        # If we're not verifying the assets, we just trust our field values
        if not verify_assets:
-            if self.sub:
-                translations = ['en']
-            translations += list(self.transcripts)
-            return translations
+            translations = list(self.transcripts)
+            if not translations or self.sub:
+                translations += ['en']
+            return set(translations)

        # If we've gotten this far, we're going to verify that the transcripts
        # being referenced are actually in the contentstore.