diff --git a/local_moodleappbehat/tests/behat/behat_app.php b/local_moodleappbehat/tests/behat/behat_app.php index ca4f512aa..498b1c111 100644 --- a/local_moodleappbehat/tests/behat/behat_app.php +++ b/local_moodleappbehat/tests/behat/behat_app.php @@ -336,7 +336,7 @@ class behat_app extends behat_app_helper { // Note there are two 'Log in' texts visible (the title and the button) so we have to use // a 'near' value here. - $this->i_press_in_the_app('"Log in" near "Forgotten"'); + $this->i_press_in_the_app('"Log in" "ion-button"'); // Wait until the main page appears. $this->spin( diff --git a/scripts/langindex.json b/scripts/langindex.json index 332b659a6..90906b272 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -2074,7 +2074,7 @@ "core.login.findyoursite": "local_moodlemobileapp", "core.login.firsttime": "moodle", "core.login.forcepasswordchangenotice": "moodle", - "core.login.forgotten": "moodle", + "core.login.forgotaccount": "moodle", "core.login.help": "moodle", "core.login.instructions": "auth", "core.login.invalidaccount": "local_moodlemobileapp", diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json index 28f619fee..c9bad9613 100644 --- a/src/core/features/login/lang.json +++ b/src/core/features/login/lang.json @@ -37,7 +37,7 @@ "exceededpasswordresetattemptssupportsubject": "I can't reset my password", "faqcannotfindmysiteanswer": "If you tried searching by URL address and still can't find your Moodle site, please get in touch with the person who takes care of Moodle in your school or learning organisation.", "faqcannotfindmysitequestion": "I can't find my site by URL address.", - "faqcantloginanswer": "

Once you've connected to your Moodle site, you should be able to log in with your usual username and password.


If you forgot your username or password, select the option Forgotten your username or password?. If you still have trouble logging in or can't see any options for retrieving your username or password, please get in touch with the person who takes care of Moodle in your school or learning organisation.

", + "faqcantloginanswer": "

Once you've connected to your Moodle site, you should be able to log in with your usual username and password.


If you forgot your username or password, select the option Lost password?. If you still have trouble logging in or can't see any options for retrieving your username or password, please get in touch with the person who takes care of Moodle in your school or learning organisation.

", "faqcantloginquestion": "I can't log in.", "faqmore": "Check out our FAQ for more answers.", "faqsetupsiteanswer": "Visit {{$link}} to check out the different options you have to create your own Moodle site.", @@ -52,7 +52,7 @@ "findyoursite": "Find your site", "firsttime": "Is this your first time here?", "forcepasswordchangenotice": "You must change your password to proceed.", - "forgotten": "Forgotten your username or password?", + "forgotaccount": "Lost password?", "help": "Help", "instructions": "Instructions", "invalidaccount": "Please check your login details and try again.", diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html index 451709a7f..e54efed08 100644 --- a/src/core/features/login/pages/credentials/credentials.html +++ b/src/core/features/login/pages/credentials/credentials.html @@ -69,7 +69,7 @@ - {{ 'core.login.forgotten' | translate }} + {{ 'core.login.forgotaccount' | translate }} diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html index dbda9509a..c5baa2686 100644 --- a/src/core/features/login/pages/reconnect/reconnect.html +++ b/src/core/features/login/pages/reconnect/reconnect.html @@ -76,7 +76,7 @@ - {{ 'core.login.forgotten' | translate }} + {{ 'core.login.forgotaccount' | translate }} diff --git a/src/core/features/login/tests/behat/basic-usage-400.feature b/src/core/features/login/tests/behat/basic-usage-400.feature index 5e6f19148..9bae39ca8 100644 --- a/src/core/features/login/tests/behat/basic-usage-400.feature +++ b/src/core/features/login/tests/behat/basic-usage-400.feature @@ -9,11 +9,11 @@ Feature: Test basic usage of login in app Scenario: Forgot password When I enter the app - And I press "Forgotten your username or password?" in the app + And I press "Lost password?" in the app And I set the field "Enter either username or email address" to "student1" And I press "Search" in the app Then I should find "Success" in the app When I press "OK" in the app - And I press "Forgotten your username or password?" in the app + And I press "Lost password?" in the app Then I should find "Contact support" in the app diff --git a/src/core/features/login/tests/behat/basic_usage-311.feature b/src/core/features/login/tests/behat/basic_usage-311.feature index a08791ffb..dc76f87e5 100644 --- a/src/core/features/login/tests/behat/basic_usage-311.feature +++ b/src/core/features/login/tests/behat/basic_usage-311.feature @@ -9,11 +9,11 @@ Feature: Test basic usage of login in app Scenario: Forgot password When I enter the app - And I press "Forgotten your username or password?" in the app + And I press "Lost password?" in the app And I set the field "Enter either username or email address" to "student1" And I press "Search" in the app Then I should find "Success" in the app When I press "OK" in the app - And I press "Forgotten your username or password?" in the app + And I press "Lost password?" in the app Then I should not find "Contact support" in the app diff --git a/src/core/features/login/tests/behat/basic_usage.feature b/src/core/features/login/tests/behat/basic_usage.feature index c7421a7c1..152edad21 100755 --- a/src/core/features/login/tests/behat/basic_usage.feature +++ b/src/core/features/login/tests/behat/basic_usage.feature @@ -36,7 +36,7 @@ Feature: Test basic usage of login in app When I set the following fields to these values in the app: | Username | student1 | | Password | student1 | - And I press "Log in" near "Forgotten your username or password?" in the app + And I press "Log in" near "Lost password?" in the app Then I should find "Acceptance test site" in the app And the UI should match the snapshot But I should not find "Log in" in the app @@ -143,11 +143,11 @@ Feature: Test basic usage of login in app Given the following config values are set as admin: | supportavailability | 2 | When I enter the app - And I press "Forgotten your username or password?" in the app + And I press "Lost password?" in the app And I set the field "Enter either username or email address" to "student1" And I press "Search" in the app Then I should find "Success" in the app When I press "OK" in the app - And I press "Forgotten your username or password?" in the app + And I press "Lost password?" in the app Then I should find "Contact support" in the app diff --git a/src/core/features/login/tests/behat/signup.feature b/src/core/features/login/tests/behat/signup.feature index 95ecfcb84..6518f3770 100755 --- a/src/core/features/login/tests/behat/signup.feature +++ b/src/core/features/login/tests/behat/signup.feature @@ -62,14 +62,14 @@ Feature: Test signup in app And I set the following fields to these values in the app: | Username | u1 | | Password | pu1 | - And I press "Log in" near "Forgotten your username or password?" in the app + And I press "Log in" near "Lost password?" in the app Then I should find "You need to confirm your account" in the app When I open a browser tab with url "$WWWROOT" And I confirm email for "u1" And I close the browser tab opened by the app And I press "Close" in the app - And I press "Log in" near "Forgotten your username or password?" in the app + And I press "Log in" near "Lost password?" in the app Then I should find "Acceptance test site" in the app But I should not find "You need to confirm your account" in the app @@ -173,7 +173,7 @@ Feature: Test signup in app And I set the following fields to these values in the app: | Username | u1 | | Password | pu1 | - And I press "Log in" near "Forgotten your username or password?" in the app + And I press "Log in" near "Lost password?" in the app And I press the user menu button in the app And I press "User Test" in the app Then I should find "No" near "Are you a developer?" in the app diff --git a/src/core/features/login/tests/behat/snapshots/test-basic-usage-of-login-in-app-add-a-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png b/src/core/features/login/tests/behat/snapshots/test-basic-usage-of-login-in-app-add-a-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png index 0c3b160a8..727cbb0e1 100644 Binary files a/src/core/features/login/tests/behat/snapshots/test-basic-usage-of-login-in-app-add-a-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png and b/src/core/features/login/tests/behat/snapshots/test-basic-usage-of-login-in-app-add-a-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png differ