From 76249b2cc0673d183bc203cb555ee0bc737f8957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 2 Dec 2024 10:25:58 +0100 Subject: [PATCH 1/2] MOBILE-4712 enrol: Remove "No enrolment key required" string --- scripts/langindex.json | 1 - src/addons/enrol/self/lang.json | 1 - src/addons/enrol/self/services/enrol-handler.ts | 4 ++-- src/core/features/course/tests/behat/basic_usage.feature | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/langindex.json b/scripts/langindex.json index 9dee9eb3af9..dd460ea094d 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -256,7 +256,6 @@ "addon.enrol_guest.passwordinvalid": "enrol_guest", "addon.enrol_self.confirmselfenrol": "local_moodlemobileapp", "addon.enrol_self.errorselfenrol": "local_moodlemobileapp", - "addon.enrol_self.nopassword": "enrol_self", "addon.enrol_self.password": "enrol_self", "addon.enrol_self.pluginname": "enrol_self", "addon.messageoutput_airnotifier.processorsettingsdesc": "local_moodlemobileapp", diff --git a/src/addons/enrol/self/lang.json b/src/addons/enrol/self/lang.json index 1fceb0abb68..cd87eba3b23 100644 --- a/src/addons/enrol/self/lang.json +++ b/src/addons/enrol/self/lang.json @@ -1,7 +1,6 @@ { "confirmselfenrol": "Are you sure you want to enrol yourself in this course?", "errorselfenrol": "An error occurred while self enrolling.", - "nopassword": "No enrolment key required.", "password": "Enrolment key", "pluginname": "Self enrolment" } diff --git a/src/addons/enrol/self/services/enrol-handler.ts b/src/addons/enrol/self/services/enrol-handler.ts index 6e74137c9d1..cca13366243 100644 --- a/src/addons/enrol/self/services/enrol-handler.ts +++ b/src/addons/enrol/self/services/enrol-handler.ts @@ -88,9 +88,9 @@ export class AddonEnrolSelfHandlerService implements CoreEnrolSelfHandler { if (!info.enrolpassword) { try { await CoreDomUtils.showConfirm( - Translate.instant('addon.enrol_self.confirmselfenrol') + '
' + - Translate.instant('addon.enrol_self.nopassword'), + Translate.instant('addon.enrol_self.confirmselfenrol'), method.name, + Translate.instant('core.courses.enrolme'), ); } catch { // User cancelled. diff --git a/src/core/features/course/tests/behat/basic_usage.feature b/src/core/features/course/tests/behat/basic_usage.feature index d6252b9a83b..20698b2fdf3 100755 --- a/src/core/features/course/tests/behat/basic_usage.feature +++ b/src/core/features/course/tests/behat/basic_usage.feature @@ -468,7 +468,7 @@ Feature: Test basic usage of one course in app And I press "Available courses" in the app And I press "Course 1" 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 Then the header should be "Course 1" in the app And I should find "Test forum name" in the app From 9272e4b2fda18b0a70b9df73565f1378e066ffc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 2 Dec 2024 11:14:43 +0100 Subject: [PATCH 2/2] MOBILE-4653 gha: Update php and pgsql --- .github/workflows/acceptance.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index c985d05ee5b..56b1202418b 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -105,7 +105,7 @@ jobs: services: postgres: - image: postgres:13 + image: postgres:14 env: POSTGRES_USER: 'postgres' POSTGRES_HOST_AUTH_METHOD: 'trust' @@ -125,7 +125,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 ini-values: max_input_vars=5000 coverage: none