From: Boris Bobrov <breton@cynicmansion.ru>
Date: Thu, 12 Jul 2018 16:49:35 +0000 (+0200)
Subject: Merge branch 'transcoding_progress'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=23af1d8cbc188c85d9f6ee9274af5b0102c48d24;p=mediagoblin.git

Merge branch 'transcoding_progress'

This probably broke stuff
---

23af1d8cbc188c85d9f6ee9274af5b0102c48d24
diff --cc mediagoblin/templates/mediagoblin/media_displays/video.html
index 8e3a202f,61baf11c..31825bfd
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@@ -59,11 -63,9 +63,13 @@@
                type="{{ media.media_data.source_type() }}"
              {% else %}
                type="{{ media.media_manager['default_webm_type'] }}"
-             {% endif %} />
-     {%- for subtitle in media.subtitle_files %}
+             {% endif %}
+             label="{{ each_media_path[0] }}" res="{{ each_media_path[1][1] }}" />
++	    {%- for subtitle in media.subtitle_files %}
 +            <track src="{{ request.app.public_store.file_url(subtitle.filepath) }}"
-               label = "{{ subtitle.name }}" kind="subtitles" >
-     {%- endfor %}
++              label="{{ subtitle.name }}" kind="subtitles">
++	    {%- endfor %}
+     {% endfor %}
      <div class="no_html5">
        {%- trans -%}Sorry, this video will not work because
        your web browser does not support HTML5