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.

diff --git a/blocks/recentlyaccessedcourses/amd/build/main.min.js b/blocks/recentlyaccessedcourses/amd/build/main.min.js
index 583a92f..594bbde 100644 (file)
Binary files a/blocks/recentlyaccessedcourses/amd/build/main.min.js and b/blocks/recentlyaccessedcourses/amd/build/main.min.js differ

diff --git a/blocks/recentlyaccessedcourses/amd/src/main.js b/blocks/recentlyaccessedcourses/amd/src/main.js
index 1669851..2fdd54c 100644 (file)
--- 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');
                 });
             } else {
                 var nocoursesimgurl = root.attr('data-nocoursesimg');

-                return Templates.render('core_course/no-courses', {
+                return Templates.render('block_recentlyaccessedcourses/no-courses', {

                     nocoursesimg: nocoursesimgurl
                 });
             }
                     nocoursesimg: nocoursesimgurl
                 });
             }

diff --git a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
index 74fef63..cdf71be 100644 (file)
--- 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';
 $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
 $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 (file)
index 26e3fd9..0000000
--- 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 (file)
index 0000000..cf1b8b0
--- /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 b06e022..9b9beb9 100644 (file)
Binary files a/blocks/starredcourses/amd/build/main.min.js and b/blocks/starredcourses/amd/build/main.min.js differ

diff --git a/blocks/starredcourses/amd/src/main.js b/blocks/starredcourses/amd/src/main.js
index db7c0ce..0c6d9c0 100644 (file)
--- 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');
             });
         } 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
             });
         }
                 nocoursesimg: nocoursesimg
             });
         }

diff --git a/blocks/starredcourses/lang/en/block_starredcourses.php b/blocks/starredcourses/lang/en/block_starredcourses.php
index 519693d..37d51a6 100644 (file)
--- 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';
 $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
 $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 (file)
index b39db61..0000000
--- 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 (file)
index 0000000..7333fc7
--- /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 35eda3d..48c962c 100644 (file)
--- 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}}"
 <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">
          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
 </div>
\ No newline at end of file