GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

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

Browse Source 
Marxjohnson mobile 3113 integration
This commit is contained in:
Juan Leyva 2019-08-12 15:19:15 +01:00 committed by GitHub
commit 8327a21f13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/langindex.json
View File

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

4
src/assets/lang/en.json
View File

@ -1403,12 +1403,13 @@
"core.courses.enrolme": "Enrol me", "core.courses.enrolme": "Enrol me",
"core.courses.errorloadcategories": "An error occurred while loading categories.", "core.courses.errorloadcategories": "An error occurred while loading categories.",
"core.courses.errorloadcourses": "An error occurred while loading courses.", "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.errorsearching": "An error occurred while searching.",
"core.courses.errorselfenrol": "An error occurred while self enrolling.", "core.courses.errorselfenrol": "An error occurred while self enrolling.",
"core.courses.filtermycourses": "Filter my courses", "core.courses.filtermycourses": "Filter my courses",
"core.courses.frontpage": "Front page", "core.courses.frontpage": "Front page",
"core.courses.hidecourse": "Hide from view", "core.courses.hidecourse": "Hide from view",
"core.courses.ignore": "Ignore",
"core.courses.mycourses": "My courses", "core.courses.mycourses": "My courses",
"core.courses.mymoodle": "Dashboard", "core.courses.mymoodle": "Dashboard",
"core.courses.nocourses": "No course information to show.", "core.courses.nocourses": "No course information to show.",
@ -1419,6 +1420,7 @@
"core.courses.password": "Enrolment key", "core.courses.password": "Enrolment key",
"core.courses.paymentrequired": "This course requires a payment for entry.", "core.courses.paymentrequired": "This course requires a payment for entry.",
"core.courses.paypalaccepted": "PayPal payments accepted", "core.courses.paypalaccepted": "PayPal payments accepted",
"core.courses.reload": "Reload",
"core.courses.removefromfavourites": "Unstar this course", "core.courses.removefromfavourites": "Unstar this course",
"core.courses.search": "Search", "core.courses.search": "Search",
"core.courses.searchcourses": "Search courses", "core.courses.searchcourses": "Search courses",

7
src/core/course/providers/course.ts
View File

@ -981,7 +981,12 @@ export class CoreCourseProvider {
} }
}).catch(() => { }).catch(() => {
// The site plugin failed to load. The user needs to restart the app to try loading it again. // 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 { } else {
// No custom format plugin. We don't need to wait for anything. // No custom format plugin. We don't need to wait for anything.

4
src/core/courses/lang/en.json
View File

@ -11,11 +11,12 @@
"enrolme": "Enrol me", "enrolme": "Enrol me",
"errorloadcategories": "An error occurred while loading categories.", "errorloadcategories": "An error occurred while loading categories.",
"errorloadcourses": "An error occurred while loading courses.", "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.", "errorsearching": "An error occurred while searching.",
"errorselfenrol": "An error occurred while self enrolling.", "errorselfenrol": "An error occurred while self enrolling.",
"filtermycourses": "Filter my courses", "filtermycourses": "Filter my courses",
"frontpage": "Front page", "frontpage": "Front page",
"ignore": "Ignore",
"hidecourse": "Hide from view", "hidecourse": "Hide from view",
"mycourses": "My courses", "mycourses": "My courses",
"nocourses": "No course information to show.", "nocourses": "No course information to show.",
@ -26,6 +27,7 @@
"password": "Enrolment key", "password": "Enrolment key",
"paymentrequired": "This course requires a payment for entry.", "paymentrequired": "This course requires a payment for entry.",
"paypalaccepted": "PayPal payments accepted", "paypalaccepted": "PayPal payments accepted",
"reload": "Reload",
"removefromfavourites": "Unstar this course", "removefromfavourites": "Unstar this course",
"search": "Search", "search": "Search",
"searchcourses": "Search courses", "searchcourses": "Search courses",