Merge pull request #2055 from crazyserver/marxjohnson-MOBILE-3113_integration

Marxjohnson mobile 3113 integration

scripts/langindex.json

@@ -1413,6 +1413,7 @@
   "core.courses.filtermycourses": "local_moodlemobileapp",
   "core.courses.frontpage": "admin",
   "core.courses.hidecourse": "block_myoverview",
+  "core.courses.ignore": "admin",
   "core.courses.mycourses": "moodle",
   "core.courses.mymoodle": "admin",
   "core.courses.nocourses": "my",
@@ -1423,6 +1424,7 @@
   "core.courses.password": "local_moodlemobileapp",
   "core.courses.paymentrequired": "moodle",
   "core.courses.paypalaccepted": "enrol_paypal",
+  "core.courses.reload": "moodle",
   "core.courses.removefromfavourites": "block_myoverview",
   "core.courses.search": "moodle",
   "core.courses.searchcourses": "moodle",

src/assets/lang/en.json

@@ -1403,12 +1403,13 @@
     "core.courses.enrolme": "Enrol me",
     "core.courses.errorloadcategories": "An error occurred while loading categories.",
     "core.courses.errorloadcourses": "An error occurred while loading courses.",
-    "core.courses.errorloadplugins": "The plugins required by this course could not be loaded correctly. Please restart the app to try again.",
+    "core.courses.errorloadplugins": "The plugins required by this course could not be loaded correctly. Please reload the app to try again.",
     "core.courses.errorsearching": "An error occurred while searching.",
     "core.courses.errorselfenrol": "An error occurred while self enrolling.",
     "core.courses.filtermycourses": "Filter my courses",
     "core.courses.frontpage": "Front page",
     "core.courses.hidecourse": "Hide from view",
+    "core.courses.ignore": "Ignore",
     "core.courses.mycourses": "My courses",
     "core.courses.mymoodle": "Dashboard",
     "core.courses.nocourses": "No course information to show.",
@@ -1419,6 +1420,7 @@
     "core.courses.password": "Enrolment key",
     "core.courses.paymentrequired": "This course requires a payment for entry.",
     "core.courses.paypalaccepted": "PayPal payments accepted",
+    "core.courses.reload": "Reload",
     "core.courses.removefromfavourites": "Unstar this course",
     "core.courses.search": "Search",
     "core.courses.searchcourses": "Search courses",

src/core/course/providers/course.ts

@@ -981,7 +981,12 @@ export class CoreCourseProvider {
                     }
                 }).catch(() => {
                     // The site plugin failed to load. The user needs to restart the app to try loading it again.
-                    this.domUtils.showErrorModal('core.courses.errorloadplugins', true);
+                    const message = this.translate.instant('core.courses.errorloadplugins');
+                    const reload = this.translate.instant('core.courses.reload');
+                    const ignore = this.translate.instant('core.courses.ignore');
+                    this.domUtils.showConfirm(message, '', reload, ignore).then(() => {
+                        window.location.reload();
+                    });
                 });
             } else {
                 // No custom format plugin. We don't need to wait for anything.

src/core/courses/lang/en.json

@@ -11,11 +11,12 @@
     "enrolme": "Enrol me",
     "errorloadcategories": "An error occurred while loading categories.",
     "errorloadcourses": "An error occurred while loading courses.",
-    "errorloadplugins": "The plugins required by this course could not be loaded correctly. Please restart the app to try again.",
+    "errorloadplugins": "The plugins required by this course could not be loaded correctly. Please reload the app to try again.",
     "errorsearching": "An error occurred while searching.",
     "errorselfenrol": "An error occurred while self enrolling.",
     "filtermycourses": "Filter my courses",
     "frontpage": "Front page",
+    "ignore": "Ignore",
     "hidecourse": "Hide from view",
     "mycourses": "My courses",
     "nocourses": "No course information to show.",
@@ -26,6 +27,7 @@
     "password": "Enrolment key",
     "paymentrequired": "This course requires a payment for entry.",
     "paypalaccepted": "PayPal payments accepted",
+    "reload": "Reload",
     "removefromfavourites": "Unstar this course",
     "search": "Search",
     "searchcourses": "Search courses",
@@ -34,4 +36,4 @@
     "sendpaymentbutton": "Send payment via PayPal",
     "show": "Show this course",
     "totalcoursesearchresults": "Total courses: {{$a}}"
-}
+}