diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 204cad480967..291f39cd83c3 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -31,30 +31,15 @@ function(doc, $, CourseDetailsModel, MainView) { CourseDetailsModel.prototype.videosourceSample = function() { if (this.has('intro_video')){ - //We teach videosourceSample how to handle properly DMCloud URLS and DM Classic ID that might be given - //as they are now stored in the db just like Youtube IDs - //but we also teach videosource Sample to handle DM Cloud ID's as they might also be an input, - //not from db as we explained, but directly from client that inputs DM Cloud ID and not DM Cloud URL - //(unless he computes md5sum in his head of course!). + // This allow videosourceSample to handle public DailyMotion ID that might be given instead of Youtube's var inputToProcess = this.get('intro_video'); var inputProcessed = inputToProcess; - //now if we have a DMCloud ID (we allow capital letters as user may not be "case sensitive") - //we can only give the DMCloud ID as it is not possible to compute here the signed URL - if(/^[a-fA-F0-9]{24}$/.test(inputToProcess)){ - inputProcessed = inputToProcess; - } - //now if we have a DMCloud URL provided by server there is nothing to do - //we do nothing here (case is shown for clarity only) - else if(/^https:\/\/cdn\.dmcloud\.net\//.test(inputToProcess)){ - inputProcessed = inputToProcess; - } - //if we have DM Classic ID (public or private) - else if((/^[a-zA-Z0-9]{6,10}$/.test(inputToProcess)) || (/^[a-zA-Z0-9]{19}$/.test(inputToProcess))){ + // if we have DailyMotion ID (public or private) + if ((/^[a-zA-Z0-9]{6,10}$/.test(inputToProcess)) || (/^[a-zA-Z0-9]{19}$/.test(inputToProcess))) { inputProcessed = "//www.dailymotion.com/embed/video/" + inputToProcess; } - //if we are in none of these cases then we do it as it was done before - //we keep the original solution used to handle youtube videos - else{ + // keep the original solution used to handle youtube videos + else { inputProcessed = "//www.youtube.com/embed/" + inputToProcess; } return inputProcessed; @@ -382,7 +367,7 @@

${_("Introducing Your Course")}

## Translators: This is the placeholder text for a field that requests a YouTube video ID for a course video - ${_("Enter your video ID (Note : DailyMotion Cloud, DailyMotion Classic and Youtube are supported. Still, the administrator may restrict the use to only one or two of these video web hosting services)")} + ${_("Enter your video ID (Note : DailyMotion and Youtube are supported. Still, the administrator may restrict the use to only one or two of these video web hosting services)")}
% endif diff --git a/conf/locale/fr/LC_MESSAGES/django.mo b/conf/locale/fr/LC_MESSAGES/django.mo index ce97b001db21..735e198c175b 100644 Binary files a/conf/locale/fr/LC_MESSAGES/django.mo and b/conf/locale/fr/LC_MESSAGES/django.mo differ diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po index 99e35bf2c8f5..1103a39f339b 100644 --- a/conf/locale/fr/LC_MESSAGES/django.po +++ b/conf/locale/fr/LC_MESSAGES/django.po @@ -19523,12 +19523,12 @@ msgstr "ID de votre vidéo" #: cms/templates/settings.html msgid "" -"Enter your video ID (Note : DailyMotion Cloud, DailyMotion Classic and " -"Youtube are supported. Still, the administrator may restrict the use to " -"only one or two of these video web hosting services)" +"Enter your video ID (Note : DailyMotion and Youtube are supported. Still, " +"the administrator may restrict the use to only one or two of these video " +"web hosting services)" msgstr "" -"Saisissez l'ID de votre video de teaser. (Notez que DailyMotion Cloud, " -"DailyMotion Classic et Youtube sont supportés. Cependant, l'administrateur " +"Saisissez l'ID de votre video de teaser. (Notez que DailyMotion et " +"Youtube sont supportés. Cependant, l'administrateur " "peut limiter l'usage d'un ou plusieurs de ces services d'hébergement de " "vidéos.)"