Translate HTML works with CSS - refs BT#19389

main/course_home/course_home.php

@@ -32,7 +32,7 @@ use Fhaculty\Graph\Graph;
 $use_anonymous = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
-$js = '<script>'.api_get_language_translate_html().'</script>';
+$js = '<style>'.api_get_language_translate_html().'</style>';
 $htmlHeadXtra[] = $js;
 
 $htmlHeadXtra[] = '<script>

main/document/showinframes.php

@@ -431,12 +431,13 @@ if ($execute_iframe) {
         if ($translate) {
             $display = ' display:none ';
             echo "<script>
-                    function waitToLoad() {
-                        $('#mainFrame').css('display', 'block');
-                        updateContentHeight();
-                    }
-                    $(function() {
-                        setTimeout(waitToLoad, 3500);
+                $(function () {
+                    var iframe = $('#mainFrame');
+                    iframe.on('load', function () {
+                        setTimeout(function () {
+                            iframe.show();
+                        }, 1650);
+                    });
                 });
             </script>";
         }

main/exercise/exercise_result.php

@@ -54,7 +54,7 @@ if (empty($objExercise)) {
     api_not_allowed(true);
 }
 
-$js = '<script>'.api_get_language_translate_html().'</script>';
+$js = '<style>'.api_get_language_translate_html().'</style>';
 $htmlHeadXtra[] = $js;
 
 if (api_is_in_gradebook()) {

main/exercise/exercise_show.php

@@ -146,7 +146,7 @@ if ($is_allowedToEdit && in_array($action, ['qualify', 'edit', 'export'])) {
 }
 
 if ($showTranslateJs) {
-    $js = '<script>'.api_get_language_translate_html().'</script>';
+    $js = '<style>'.api_get_language_translate_html().'</style>';
     $htmlHeadXtra[] = $js;
 }
 

main/exercise/exercise_submit.php

@@ -51,7 +51,7 @@ if ($showGlossary) {
     $htmlHeadXtra[] = api_get_js('jquery.highlight.js');
 }
 
-$js = '<script>'.api_get_language_translate_html().'</script>';
+$js = '<style>'.api_get_language_translate_html().'</style>';
 $htmlHeadXtra[] = $js;
 
 $htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js');

main/exercise/overview.php

@@ -19,7 +19,7 @@ Exercise::cleanSessionVariables();
 
 $this_section = SECTION_COURSES;
 
-$js = '<script>'.api_get_language_translate_html().'</script>';
+$js = '<style>'.api_get_language_translate_html().'</style>';
 $htmlHeadXtra[] = $js;
 
 // Notice for unauthorized people.

main/inc/ajax/lang.ajax.php

@@ -12,7 +12,7 @@ $action = $_REQUEST['a'];
 
 switch ($action) {
     case 'translate_html':
-        header('Content-type: application/x-javascript');
+        header('Content-Type: text/css');
 
         echo api_get_language_translate_html();
         break;

main/inc/lib/api.lib.php

@@ -9638,22 +9638,6 @@ function api_get_language_translate_html()
         return '';
     }
 
-    $languageList = api_get_languages();
-    $hideAll = '';
-    foreach ($languageList['all'] as $language) {
-        $hideAll .= '
-        $("span:lang('.$language['isocode'].')").filter(
-            function(e, val) {
-                // Only find the spans if they have set the lang
-                if ($(this).attr("lang") == null) {
-                    return false;
-                }
-
-                // Ignore ckeditor classes
-                return !this.className.match(/cke(.*)/);
-        }).hide();'."\n";
-    }
-
     $userInfo = api_get_user_info();
     $languageId = api_get_language_id($userInfo['language']);
     $languageInfo = api_get_language_info($languageId);
@@ -9663,42 +9647,11 @@ function api_get_language_translate_html()
         $isoCode = $languageInfo['isocode'];
     }
 
-    return '
-            $(function() {
-                '.$hideAll.'
-                var defaultLanguageFromUser = "'.$isoCode.'";
-
-                $("span:lang('.$isoCode.')").filter(
-                    function() {
-                        // Ignore ckeditor classes
-                        return !this.className.match(/cke(.*)/);
-                }).show();
-
-                var defaultLanguage = "";
-                var langFromUserFound = false;
-
-                $(this).find("span").filter(
-                    function() {
-                        // Ignore ckeditor classes
-                        return !this.className.match(/cke(.*)/);
-                }).each(function() {
-                    defaultLanguage = $(this).attr("lang");
-                    if (defaultLanguage) {
-                        $(this).before().next("br").remove();
-                        if (defaultLanguageFromUser == defaultLanguage) {
-                            langFromUserFound = true;
-                        }
-                    }
-                });
-
-                // Show default language
-                if (langFromUserFound == false && defaultLanguage) {
-                    $("span:lang("+defaultLanguage+")").filter(
-                    function() {
-                            // Ignore ckeditor classes
-                            return !this.className.match(/cke(.*)/);
-                    }).show();
+    return 'span[lang] {
+            display: none;
         }
-            });
-    ';
+        span[class^="cke"],
+        span[lang="'.$isoCode.'"] {
+            display: inline;
+        }';
 }

main/inc/lib/display.lib.php

@@ -2934,7 +2934,7 @@ HTML;
         $translateHtml = '';
         $translate = api_get_configuration_value('translate_html');
         if ($translate) {
-            $translateHtml = '{type:"script", src:"'.api_get_path(WEB_AJAX_PATH).'lang.ajax.php?a=translate_html&'.api_get_cidreq().'"},';
+            $translateHtml = '{type:"stylesheet", src:"'.api_get_path(WEB_AJAX_PATH).'lang.ajax.php?a=translate_html&'.api_get_cidreq().'"},';
         }
 
         $customCss = api_get_visual_theme();
@@ -2969,8 +2969,7 @@ HTML;
                     {type:"script", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.js"},
                     {type:"script", src: "'.$webPublicPath.'assets/mediaelement/plugins/markersrolls/markersrolls.js"},
                     '.$videoPluginFiles.'
-                ]},
-                '.$translateHtml.'
+                ]}
             ]},
             '.$videoPluginCssFiles.'
             {type:"script", src:"'.$webPublicPath.'assets/MathJax/MathJax.js?config=AM_HTMLorMML"},
@@ -2980,6 +2979,7 @@ HTML;
             {type:"stylesheet", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelementplayer.min.css"},
             {type:"stylesheet", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.css"},
             '.$fileCustomCssMedia.',
+            '.$translateHtml.'
         ]);';
 
         return $frameReady;