MOBILE-4201 login: Change forgotten password text

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(

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",

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": "<p>Once you've connected to your Moodle site, you should be able to log in with your usual username and password.</p><br><p>If you forgot your username or password, select the option <strong>Forgotten your username or password?</strong>. 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.</p>",
+    "faqcantloginanswer": "<p>Once you've connected to your Moodle site, you should be able to log in with your usual username and password.</p><br><p>If you forgot your username or password, select the option <strong>Lost password?</strong>. 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.</p>",
     "faqcantloginquestion": "I can't log in.",
     "faqmore": "Check out <a href=\"https://docs.moodle.org/en/Moodle_app_FAQ#toc\" target=\"_blank\">our FAQ</a> 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.",

src/core/features/login/pages/credentials/credentials.html

@@ -69,7 +69,7 @@
                     <!-- Forgotten password option. -->
                     <ion-button *ngIf="showForgottenPassword" expand="block" fill="clear"
                         class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
-                        {{ 'core.login.forgotten' | translate }}
+                        {{ 'core.login.forgotaccount' | translate }}
                     </ion-button>
                 </form>
 

src/core/features/login/pages/reconnect/reconnect.html

@@ -76,7 +76,7 @@
                     <!-- Forgotten password option. -->
                     <ion-button *ngIf="showForgottenPassword" expand="block" fill="clear"
                         class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
-                        {{ 'core.login.forgotten' | translate }}
+                        {{ 'core.login.forgotaccount' | translate }}
                     </ion-button>
                 </form>
 

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

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

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

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