MDL-63244 core: make mustache retrieve language

safatshahin · Mar 19, 2019 · 545e2ab · 545e2ab
1 parent ec81914
commit 545e2ab
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/lib/amd/build/templates.min.js b/lib/amd/build/templates.min.js
diff --git a/lib/amd/src/templates.js b/lib/amd/src/templates.js
@@ -146,7 +146,8 @@ define([
                     args: {
                         component: component,
                         template: name,
-                        themename: theme
+                        themename: theme,
+                        lang: $('html').attr('lang').replace(/-/g, '_')
                     }
                 });
                 // Remember the index in the requests list for this template so that

diff --git a/lib/classes/output/external.php b/lib/classes/output/external.php
@@ -104,7 +104,8 @@ public static function load_template_with_dependencies_parameters() {
             'component' => new external_value(PARAM_COMPONENT, 'component containing the template'),
             'template' => new external_value(PARAM_ALPHANUMEXT, 'name of the template'),
             'themename' => new external_value(PARAM_ALPHANUMEXT, 'The current theme.'),
-            'includecomments' => new external_value(PARAM_BOOL, 'Include comments or not', VALUE_DEFAULT, false)
+            'includecomments' => new external_value(PARAM_BOOL, 'Include comments or not', VALUE_DEFAULT, false),
+            'lang' => new external_value(PARAM_LANG, 'lang', VALUE_DEFAULT, null),
         ]);
     }
 
@@ -115,13 +116,15 @@ public static function load_template_with_dependencies_parameters() {
      * @param string $template The name of the template.
      * @param string $themename The name of the current theme.
      * @param bool $includecomments Whether to strip comments from the template source.
+     * @param string $lang moodle translation language, null means use current.
      * @return string the template
      */
     public static function load_template_with_dependencies(
         string $component,
         string $template,
         string $themename,
-        bool $includecomments = false
+        bool $includecomments = false,
+        string $lang = null
     ) {
         global $DB, $CFG, $PAGE;
 
@@ -131,7 +134,8 @@ public static function load_template_with_dependencies(
                 'component' => $component,
                 'template' => $template,
                 'themename' => $themename,
-                'includecomments' => $includecomments
+                'includecomments' => $includecomments,
+                'lang' => $lang
             ]
         );
 
@@ -141,7 +145,10 @@ public static function load_template_with_dependencies(
             $params['component'],
             $params['template'],
             $params['themename'],
-            $params['includecomments']
+            $params['includecomments'],
+            [],
+            [],
+            $params['lang']
         );
         $formatdependencies = function($dependency) {
             $results = [];