From 9ae6cd775a1382fc833e6cf0531e5f07dea640dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Thu, 11 May 2017 23:46:18 +0200
Subject: [PATCH] MDL-60693 backup: Use multilang with course activities

On backup and restore, activities are shown after passing format_string,
supporting multilang.
---
 backup/util/ui/backup_ui_setting.class.php | 12 ++++++++----
 backup/util/ui/base_moodleform.class.php   |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/backup/util/ui/backup_ui_setting.class.php b/backup/util/ui/backup_ui_setting.class.php
index 327f35085a670..d928743ed9869 100644
--- a/backup/util/ui/backup_ui_setting.class.php
+++ b/backup/util/ui/backup_ui_setting.class.php
@@ -355,7 +355,8 @@ class backup_setting_ui_text extends backup_setting_ui {
      */
     public function get_element_properties(base_task $task = null, renderer_base $output = null) {
         $icon = $this->get_icon();
-        $label = $this->get_label($task);
+        $context = context_course::instance($task->get_courseid());
+        $label = format_string($this->get_label($task), true, array('context' => $context));
         if (!empty($icon)) {
             $label .= $output->render($icon);
         }
@@ -418,7 +419,8 @@ public function __construct(backup_setting $setting, $label = null, $text = null
     public function get_element_properties(base_task $task = null, renderer_base $output = null) {
         // Name, label, text, attributes.
         $icon = $this->get_icon();
-        $label = $this->get_label($task);
+        $context = context_course::instance($task->get_courseid());
+        $label = format_string($this->get_label($task), true, array('context' => $context));
         if (!empty($icon)) {
             $label .= $output->render($icon);
         }
@@ -525,7 +527,8 @@ public function __construct(backup_setting $setting, $label = null, $text = null
      */
     public function get_element_properties(base_task $task = null, renderer_base $output = null) {
         $icon = $this->get_icon();
-        $label = $this->get_label($task);
+        $context = context_course::instance($task->get_courseid());
+        $label = format_string($this->get_label($task), true, array('context' => $context));
         if (!empty($icon)) {
             $label .= $output->render($icon);
         }
@@ -602,7 +605,8 @@ public function __construct(backup_setting $setting, $label = null, $values = nu
      */
     public function get_element_properties(base_task $task = null, renderer_base $output = null) {
         $icon = $this->get_icon();
-        $label = $this->get_label($task);
+        $context = context_course::instance($task->get_courseid());
+        $label = format_string($this->get_label($task), true, array('context' => $context));
         if (!empty($icon)) {
             $label .= $output->render($icon);
         }
diff --git a/backup/util/ui/base_moodleform.class.php b/backup/util/ui/base_moodleform.class.php
index b5c8159df1ebb..4f8928edc2eb4 100644
--- a/backup/util/ui/base_moodleform.class.php
+++ b/backup/util/ui/base_moodleform.class.php
@@ -302,7 +302,8 @@ public function add_fixed_setting(backup_setting $setting, base_task $task) {
                     $icon = '';
                     break;
             }
-            $label = $settingui->get_label($task);
+            $context = context_course::instance($task->get_courseid());
+            $label = format_string($settingui->get_label($task), true, array('context' => $context));
             $labelicon = $settingui->get_icon();
             if (!empty($labelicon)) {
                 $label .= '&nbsp;'.$OUTPUT->render($labelicon);