From 298133d638dbe9f30265f5929a6e2b26b029432d Mon Sep 17 00:00:00 2001
From: Mathew May <mathewm@hotmail.co.nz>
Date: Fri, 8 Feb 2019 12:31:11 +0800
Subject: [PATCH] MDL-63880 core_course: Change core no-course template.

Added two templates back in that define what string to use in the two affected blocks.
---
 .../amd/build/main.min.js                     | Bin 922 -> 940 bytes
 .../recentlyaccessedcourses/amd/src/main.js   |   2 +-
 .../lang/en/block_recentlyaccessedcourses.php |   2 --
 .../lang/en/deprecated.txt                    |   1 -
 .../templates/no-courses.mustache             |  21 ++++++++++++++++++
 blocks/starredcourses/amd/build/main.min.js   | Bin 873 -> 882 bytes
 blocks/starredcourses/amd/src/main.js         |   2 +-
 .../lang/en/block_starredcourses.php          |   2 --
 blocks/starredcourses/lang/en/deprecated.txt  |   1 -
 .../templates/no-courses.mustache             |  21 ++++++++++++++++++
 course/templates/no-courses.mustache          |   4 ++--
 11 files changed, 46 insertions(+), 10 deletions(-)
 delete mode 100644 blocks/recentlyaccessedcourses/lang/en/deprecated.txt
 create mode 100644 blocks/recentlyaccessedcourses/templates/no-courses.mustache
 delete mode 100644 blocks/starredcourses/lang/en/deprecated.txt
 create mode 100644 blocks/starredcourses/templates/no-courses.mustache

diff --git a/blocks/recentlyaccessedcourses/amd/build/main.min.js b/blocks/recentlyaccessedcourses/amd/build/main.min.js
index 583a92fca43eee9207da04363c1b43e65d068559..594bbde694f8816340b08d762fd308dcfcee52e4 100644
GIT binary patch
delta 22
ecmbQmzJ`6nZAP}Foc!eM_=z9HH$P+C!UzCoCJ8tI

delta 24
gcmZ3(K8t<BZAR|o{G!zO<owd2;?&JQ7`HG20C<WC<^TWy

diff --git a/blocks/recentlyaccessedcourses/amd/src/main.js b/blocks/recentlyaccessedcourses/amd/src/main.js
index 16698513627..2fdd54cb5a0 100644
--- a/blocks/recentlyaccessedcourses/amd/src/main.js
+++ b/blocks/recentlyaccessedcourses/amd/src/main.js
@@ -74,7 +74,7 @@ define(
                 });
             } else {
                 var nocoursesimgurl = root.attr('data-nocoursesimg');
-                return Templates.render('core_course/no-courses', {
+                return Templates.render('block_recentlyaccessedcourses/no-courses', {
                     nocoursesimg: nocoursesimgurl
                 });
             }
diff --git a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
index 74fef63895c..cdf71bed1ff 100644
--- a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
+++ b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
@@ -24,6 +24,4 @@ $string['pluginname'] = 'Recently accessed courses';
 $string['privacy:metadata'] = 'The Recently accessed courses block does not store any personal data.';
 $string['recentlyaccessedcourses:addinstance'] = 'Add a new Recently accessed courses block';
 $string['recentlyaccessedcourses:myaddinstance'] = 'Add a new recently accessed courses block to Dashboard';
-
-// Deprecated since Moodle 3.7.
 $string['nocourses'] = 'No recent courses';
\ No newline at end of file
diff --git a/blocks/recentlyaccessedcourses/lang/en/deprecated.txt b/blocks/recentlyaccessedcourses/lang/en/deprecated.txt
deleted file mode 100644
index 26e3fd98fcc..00000000000
--- a/blocks/recentlyaccessedcourses/lang/en/deprecated.txt
+++ /dev/null
@@ -1 +0,0 @@
-nocourses,block_recentlyaccessedcourses
\ No newline at end of file
diff --git a/blocks/recentlyaccessedcourses/templates/no-courses.mustache b/blocks/recentlyaccessedcourses/templates/no-courses.mustache
new file mode 100644
index 00000000000..cf1b8b0b00f
--- /dev/null
+++ b/blocks/recentlyaccessedcourses/templates/no-courses.mustache
@@ -0,0 +1,21 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{< core_course/no-courses}}
+    {{$nocoursestring}}
+        {{#str}} nocourses, block_recentlyaccessedcourses {{/str}}
+    {{/nocoursestring}}
+{{/ core_course/no-courses}}
diff --git a/blocks/starredcourses/amd/build/main.min.js b/blocks/starredcourses/amd/build/main.min.js
index b06e02218543eb30fa9ce63ca5e54c9607931fbd..9b9beb924559fe043e47e44a019800786d51ef15 100644
GIT binary patch
delta 33
pcmaFK_K9u7IYyDBoc!eM_~MepqN3E4<owd2;?&~JHyI}|0s!)Y4g3HA

delta 24
gcmeyw_L6PGIY#c}{G!zO<owd2;?&KL7$-0S0E8h5G5`Po

diff --git a/blocks/starredcourses/amd/src/main.js b/blocks/starredcourses/amd/src/main.js
index db7c0ce6149..0c6d9c0a3cc 100644
--- a/blocks/starredcourses/amd/src/main.js
+++ b/blocks/starredcourses/amd/src/main.js
@@ -58,7 +58,7 @@ function(
             });
         } else {
             var nocoursesimg = root.find(SELECTORS.STARRED_COURSES_REGION_VIEW).attr('data-nocoursesimg');
-            return Templates.render('core_course/no-courses', {
+            return Templates.render('block_starredcourses/no-courses', {
                 nocoursesimg: nocoursesimg
             });
         }
diff --git a/blocks/starredcourses/lang/en/block_starredcourses.php b/blocks/starredcourses/lang/en/block_starredcourses.php
index 519693d65e2..37d51a6fb29 100644
--- a/blocks/starredcourses/lang/en/block_starredcourses.php
+++ b/blocks/starredcourses/lang/en/block_starredcourses.php
@@ -26,6 +26,4 @@ $string['pluginname'] = 'Starred courses';
 $string['privacy:metadata'] = 'The starred courses block does not store any personal data.';
 $string['starredcourses:addinstance'] = 'Add a new starred courses block';
 $string['starredcourses:myaddinstance'] = 'Add a new starred courses block to Dashboard';
-
-// Deprecated since Moodle 3.7.
 $string['nocourses'] = 'No starred courses';
\ No newline at end of file
diff --git a/blocks/starredcourses/lang/en/deprecated.txt b/blocks/starredcourses/lang/en/deprecated.txt
deleted file mode 100644
index b39db611ce9..00000000000
--- a/blocks/starredcourses/lang/en/deprecated.txt
+++ /dev/null
@@ -1 +0,0 @@
-nocourses,block_starredcourses
\ No newline at end of file
diff --git a/blocks/starredcourses/templates/no-courses.mustache b/blocks/starredcourses/templates/no-courses.mustache
new file mode 100644
index 00000000000..7333fc724e1
--- /dev/null
+++ b/blocks/starredcourses/templates/no-courses.mustache
@@ -0,0 +1,21 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{< core_course/no-courses}}
+    {{$nocoursestring}}
+        {{#str}} nocourses, block_starredcourses {{/str}}
+    {{/nocoursestring}}
+{{/ core_course/no-courses}}
diff --git a/course/templates/no-courses.mustache b/course/templates/no-courses.mustache
index 35eda3d45d0..48c962cee14 100644
--- a/course/templates/no-courses.mustache
+++ b/course/templates/no-courses.mustache
@@ -27,7 +27,7 @@
 <div class="text-xs-center text-center m-t-3" data-region="empty-message">
     <img class="empty-placeholder-image-lg m-t-1"
          src="{{nocoursesimg}}"
-         alt="{{#str}} nocourses, core {{/str}}"
+         alt="{{$nocoursestring}}{{#str}} nocourses, core {{/str}}{{/nocoursestring}}"
          role="presentation">
-    <p class="text-muted mt-3">{{#str}} nocourses, core {{/str}}</p>
+    <p class="text-muted mt-3">{{$nocoursestring}}{{#str}} nocourses, core {{/str}}{{/nocoursestring}}</p>
 </div>
\ No newline at end of file
-- 
2.17.1