From e5fcf769f1260fa3fc51e7c9bd16c9302da3200c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Nov 2022 17:35:27 +0100
Subject: [PATCH] MOBILE-4059 core: Update FAQs

---
 scripts/langindex.json                         |  2 --
 .../login/components/site-help/site-help.html  | 18 ++++--------------
 src/core/features/login/lang.json              | 16 +++++++---------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 03b75f59e..36318968e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1933,8 +1933,6 @@
   "core.login.exceededloginattemptssupportsubject": "local_moodlemobileapp",
   "core.login.exceededpasswordresetattempts": "local_moodlemobileapp",
   "core.login.exceededpasswordresetattemptssupportsubject": "local_moodlemobileapp",
-  "core.login.faqcannotconnectanswer": "local_moodlemobileapp",
-  "core.login.faqcannotconnectquestion": "local_moodlemobileapp",
   "core.login.faqcannotfindmysiteanswer": "local_moodlemobileapp",
   "core.login.faqcannotfindmysitequestion": "local_moodlemobileapp",
   "core.login.faqsetupsiteanswer": "local_moodlemobileapp",
diff --git a/src/core/features/login/components/site-help/site-help.html b/src/core/features/login/components/site-help/site-help.html
index 4a08dae6c..25304a89a 100644
--- a/src/core/features/login/components/site-help/site-help.html
+++ b/src/core/features/login/components/site-help/site-help.html
@@ -12,34 +12,24 @@
 </ion-header>
 <ion-content>
     <ion-list>
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <h2><strong>{{ 'core.login.faqcannotfindmysitequestion' | translate }}</strong></h2>
-            </ion-label>
-        </ion-item>
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <p>{{ 'core.login.faqcannotfindmysiteanswer' | translate }}</p>
-            </ion-label>
-        </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h2><strong>{{ 'core.login.faqwhatisurlquestion' | translate }}</strong></h2>
             </ion-label>
         </ion-item>
-        <ion-item class="ion-text-wrap core-login-faqwhatisurlanswer">
+        <ion-item class="ion-text-wrap">
             <ion-label>
                 <p [innerHTML]="'core.login.faqwhatisurlanswer' | translate: {$image: urlImageHtml}"></p>
             </ion-label>
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <h2><strong>{{ 'core.login.faqcannotconnectquestion' | translate }}</strong></h2>
+                <h2><strong>{{ 'core.login.faqcannotfindmysitequestion' | translate }}</strong></h2>
             </ion-label>
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <p>{{ 'core.login.faqcannotconnectanswer' | translate }}</p>
+                <p>{{ 'core.login.faqcannotfindmysiteanswer' | translate }}</p>
             </ion-label>
         </ion-item>
         <ion-item class="ion-text-wrap">
@@ -62,7 +52,7 @@
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <p>{{ 'core.login.faqtestappanswer' | translate }}</p>
+                <p [innerHTML]="'core.login.faqtestappanswer' | translate"></p>
             </ion-label>
         </ion-item>
         <ion-item class="ion-text-wrap" *ngIf="canScanQR">
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index 946304293..2b79ba053 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -30,19 +30,17 @@
     "exceededloginattemptssupportsubject": "I can't log in",
     "exceededpasswordresetattempts": "It seems you are having trouble accessing your account. You can contact your school or learning provider or try again later.",
     "exceededpasswordresetattemptssupportsubject": "I can't reset my password",
-    "faqcannotconnectanswer": "Please, contact your school or learning provider.",
-    "faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.",
-    "faqcannotfindmysiteanswer": "Have you typed the name correctly? It's also possible that your site is not included in our public sites directory. If you still can't find it, please enter your site address instead.",
-    "faqcannotfindmysitequestion": "I can't find my site.",
+    "faqcannotfindmysiteanswer": "If you still can't find it, please contact your school or learning provider for help.",
+    "faqcannotfindmysitequestion": "I can't find my site by address.",
     "faqsetupsiteanswer": "Visit {{$link}} to check out the different options you have to create your own Moodle site.",
     "faqsetupsitelinktitle": "Get started.",
     "faqsetupsitequestion": "I want to set up my own Moodle site.",
-    "faqtestappanswer": "To test the app in a Moodle Demo Site, type \"teacher\" or \"student\" in the \"Your site\" field and click the \"Connect to your site\" button.",
-    "faqtestappquestion": "I just want to test the app, what can I do?",
-    "faqwhatisurlanswer": "<p>Every organisation has their own unique address or URL for their Moodle site. To find the address:</p><ol><li>Open a web browser and go to your Moodle site login page.</li><li>At the top of the page, in the address bar, you will see the URL of your Moodle site e.g. \"campus.example.edu\".<br>{{$image}}</li><li>Copy the address (do not copy the /login and what comes after), paste it into the Moodle app then click \"Connect to your site\"</li><li>Now you can log in to your site using your username and password.</li></ol>",
-    "faqwhatisurlquestion": "What is my site address? How can I find my site URL?",
+    "faqtestappanswer": "To test the app in a Moodle demo site, type \"teacher\" or \"student\" in the <strong>Your site</strong> field and tap <strong>Connect to your site</strong>.",
+    "faqtestappquestion": "Can I test the app on a demo site?",
+    "faqwhatisurlanswer": "<p>If you can't find your site by name, try searching by address instead.</p><p>To find your site address:</p><ol><li>Open a web browser and go to your Moodle site login page.</li><li>At the top of the page, in the address bar, you will see the URL of your Moodle site e.g. \"campus.example.edu\".<br>{{$image}}</li><li>Copy the address (don't copy the /login nor what comes after), paste it into <strong>Your site</strong> in the app, then tap <strong>Connect to your site</strong></li><li>Now you can log in to your site with your username and password.</li></ol>",
+    "faqwhatisurlquestion": "How can I find my site?",
     "faqwhereisqrcode": "Where can I find the QR code?",
-    "faqwhereisqrcodeanswer": "<p>If your organisation has enabled it, you will find a QR code on the web site at the bottom of your user profile page.</p>{{$image}}",
+    "faqwhereisqrcodeanswer": "<p>If your school or learning provider has enabled it, you will find a QR code on the web site at the bottom of your user profile page.</p>{{$image}}",
     "findyoursite": "Find your site",
     "firsttime": "Is this your first time here?",
     "forcepasswordchangenotice": "You must change your password to proceed.",