From: Jan Gerber <j@users.mediawiki.org>
Date: Sat, 7 Nov 2009 13:58:45 +0000 (+0000)
Subject: also support cmml subtitles
X-Git-Tag: 1.31.0-rc.0~38917
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=f3706cf4d18a33b8208389f3af102148e88ee858;p=lhc%2Fweb%2Fwiklou.git

also support cmml subtitles
---

diff --git a/js2/mwEmbed/libTimedText/mvTextInterface.js b/js2/mwEmbed/libTimedText/mvTextInterface.js
index e566f2544f..8cbb9c8f28 100644
--- a/js2/mwEmbed/libTimedText/mvTextInterface.js
+++ b/js2/mwEmbed/libTimedText/mvTextInterface.js
@@ -66,8 +66,18 @@ mvTextInterface.prototype = {
 									}
 									for(var i in subData.query.allpages){
 										var subPage = subData.query.allpages[i];
-										langKey = subPage.title.split('.');
-										langKey = langKey[ langKey.length-2 ];
+										var langKey = subPage.title.split('.');
+										var extension = langKey.pop();
+										langKey = langKey.pop();
+										var mimeTypes = {
+										    'srt': 'text/x-srt',
+										    'cmml': 'text/cmml'
+										}
+										if( !mimeTypes[ extension ] ){
+											js_log('Error: unknown extension:'+ extension);
+											continue;
+										}
+
 										if( !langData[ langKey] ){
 											js_log('Error: langkey:'+ langKey + ' not found');
 										}else{
@@ -75,7 +85,7 @@ mvTextInterface.prototype = {
 											$j(textElm).attr({
 												'category' : 'SUB',
 												'lang' 	: langKey,
-												'type' 	: "text/x-srt",
+												'type' 	: mimeTypes[ extension ],
 												'title'	: gM('mwe-subtitles', langData[ langKey]),
 												'src' : wgServer + wgScript + '?title=' + subPage.title + '&action=raw'
 											});