EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4251 from crazyserver/MOBILE-4712 

MOBILE-4712 enrol: Remove "No enrolment key required" string
main
Dani Palou 2024-12-03 08:45:57 +01:00 committed by GitHub
parent 9dd6d8f17d 9272e4b2fd
commit 53baee7ab9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/acceptance.yml vendored
View File

@ -105,7 +105,7 @@ jobs:
services: services:
postgres: postgres:
image: postgres:13 image: postgres:14
env: env:
POSTGRES_USER: 'postgres' POSTGRES_USER: 'postgres'
POSTGRES_HOST_AUTH_METHOD: 'trust' POSTGRES_HOST_AUTH_METHOD: 'trust'
@ -125,7 +125,7 @@ jobs:
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:
php-version: 8.1 php-version: 8.2
ini-values: max_input_vars=5000 ini-values: max_input_vars=5000
coverage: none coverage: none

1
scripts/langindex.json
View File

@ -256,7 +256,6 @@
"addon.enrol_guest.passwordinvalid": "enrol_guest", "addon.enrol_guest.passwordinvalid": "enrol_guest",
"addon.enrol_self.confirmselfenrol": "local_moodlemobileapp", "addon.enrol_self.confirmselfenrol": "local_moodlemobileapp",
"addon.enrol_self.errorselfenrol": "local_moodlemobileapp", "addon.enrol_self.errorselfenrol": "local_moodlemobileapp",
"addon.enrol_self.nopassword": "enrol_self",
"addon.enrol_self.password": "enrol_self", "addon.enrol_self.password": "enrol_self",
"addon.enrol_self.pluginname": "enrol_self", "addon.enrol_self.pluginname": "enrol_self",
"addon.messageoutput_airnotifier.processorsettingsdesc": "local_moodlemobileapp", "addon.messageoutput_airnotifier.processorsettingsdesc": "local_moodlemobileapp",

1
src/addons/enrol/self/lang.json
View File

@ -1,7 +1,6 @@
{ {
"confirmselfenrol": "Are you sure you want to enrol yourself in this course?", "confirmselfenrol": "Are you sure you want to enrol yourself in this course?",
"errorselfenrol": "An error occurred while self enrolling.", "errorselfenrol": "An error occurred while self enrolling.",
"nopassword": "No enrolment key required.",
"password": "Enrolment key", "password": "Enrolment key",
"pluginname": "Self enrolment" "pluginname": "Self enrolment"
} }

4
src/addons/enrol/self/services/enrol-handler.ts
View File

@ -88,9 +88,9 @@ export class AddonEnrolSelfHandlerService implements CoreEnrolSelfHandler {
if (!info.enrolpassword) { if (!info.enrolpassword) {
try { try {
await CoreDomUtils.showConfirm( await CoreDomUtils.showConfirm(
Translate.instant('addon.enrol_self.confirmselfenrol') + '<br>' + Translate.instant('addon.enrol_self.confirmselfenrol'),
Translate.instant('addon.enrol_self.nopassword'),
method.name, method.name,
Translate.instant('core.courses.enrolme'),
); );
} catch { } catch {
// User cancelled. // User cancelled.

2
src/core/features/course/tests/behat/basic_usage.feature
View File

@ -468,7 +468,7 @@ Feature: Test basic usage of one course in app
And I press "Available courses" in the app And I press "Available courses" in the app
And I press "Course 1" in the app And I press "Course 1" in the app
And I press "Enrol me" in the app And I press "Enrol me" in the app
And I press "OK" in the app And I press "Enrol me" in the app
And I wait loading to finish in the app And I wait loading to finish in the app
Then the header should be "Course 1" in the app Then the header should be "Course 1" in the app
And I should find "Test forum name" in the app And I should find "Test forum name" in the app