Browse files

Merge branch 'staging' into dev

  • Loading branch information...
2 parents c7e13f0 + 9d6e813 commit 381b9d30f7a07ca0e58e609b3469751307d6abb7 @sjl sjl committed Jul 3, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 apps/videos/forms.py
  2. +1 −1 apps/widget/rpc.py
View
2 apps/videos/forms.py
@@ -596,7 +596,7 @@ def save(self):
translated_from = video.subtitle_language(translated_from_language)
- if translated_from and translated_from.version():
+ if is_complete and translated_from and translated_from.version():
original_subs_count = translated_from.version().subtitle_set.count()
is_complete = original_subs_count <= len(self._parser)
View
2 apps/widget/rpc.py
@@ -238,7 +238,7 @@ def fetch_video_id_and_settings(self, request, video_id):
# Ugly hack for N caption display.
def get_caption_display_mode(self, language):
team_video = language.video.get_team_video()
- if team_video and team_video.team.slug == 'ted':
+ if team_video and team_video.team.slug == 'netflix':
return 'n'
else:
return 'normal'

0 comments on commit 381b9d3

Please sign in to comment.