Merge pull request #5467 from mrpau/hotfix/5464-captions-on-by-default

Captions on by default.
learningequality · Jun 6, 2017 · 6b907d3 · 6b907d3
2 parents 153b1aa + 517869f
commit 6b907d3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/docs/installguide/release_notes.rst b/docs/installguide/release_notes.rst
@@ -17,6 +17,11 @@ Bug fixes
 
  * Do not rely on ``ifconfig`` removed in Ubuntu 17.04+ :url-issue:`5455`
 
+New Features
+^^^^^^^^^^^^
+
+* Enabled captions by default for English dubbed videos. :url-issue:`5464`
+
 
 0.17.1
 ------

diff --git a/kalite/distributed/static/js/distributed/base/handlebars.js b/kalite/distributed/static/js/distributed/base/handlebars.js
@@ -113,4 +113,12 @@ Handlebars.registerHelper("ifObject", function(candidate, options){
     }
 });
 
+Handlebars.registerHelper("current_language_is", function(lc, options) {
+    if(window.sessionModel.get("CURRENT_LANGUAGE") == lc) {
+        return options.fn(this);
+    } else {
+        return options.inverse(this);
+    }
+});
+
 module.exports = Handlebars;
diff --git a/kalite/distributed/static/js/distributed/video/hbtemplates/video-player.handlebars b/kalite/distributed/static/js/distributed/video/hbtemplates/video-player.handlebars
@@ -1,9 +1,11 @@
 <div id="video-player"{{#unless content_urls }} class="client-online-only"{{/unless}}>
     <video class="video-player video-js vjs-default-skin vjs-fullscreen" id="{{ random_id }}">
         <source src="{{ content_urls.stream }}" type="{{ content_urls.stream_type }}" />
-        {{#each subtitle_urls }}
-        <track kind="captions" src="{{ this.url }}" srclang="{{ code }}" label="{{ name }}" {{#ifcond code "==" ../selected_language }}{{#ifcond ../code "!=" "en" }}default="True"{{/ifcond}}{{/ifcond}}/>
-        {{/each}}
+            {{#ifcond translated_youtube_lang "==" "en"}}
+                {{#each subtitle_urls}}
+                    <track kind="captions" src="{{ this.url }}" srclang="{{ this.code }}" label="{{ this.name }}" {{#current_language_is this.code}}default{{/current_language_is}}/>
+                {{/each}}
+            {{/ifcond}}
     </video>
 </div>