Merge pull request moodlehq#4251 from crazyserver/MOBILE-4712

MOBILE-4712 enrol: Remove "No enrolment key required" string
crazyserver · Dec 3, 2024 · 53baee7 · 53baee7
2 parents 9dd6d8f + 9272e4b
commit 53baee7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git 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
 

diff --git 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
@@ -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
@@ -88,9 +88,9 @@ export class AddonEnrolSelfHandlerService implements CoreEnrolSelfHandler {
         if (!info.enrolpassword) {
             try {
                 await CoreDomUtils.showConfirm(
-                    Translate.instant('addon.enrol_self.confirmselfenrol') + '<br>' +
-                    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
@@ -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