From e33c91493531224e58ae8341971f4b9ea5782435 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Tue, 8 Mar 2022 10:15:11 +0100
Subject: [PATCH] MOBILE-3833 release: Fix strings

- Use core accessibility and favourites
- Keep in English the developer options
- Remove the review of attempt one (redundant)
---
 scripts/langindex.json                               | 12 ++----------
 .../components/filteroptions/filteroptions.html      |  2 +-
 src/addons/block/myoverview/lang.json                |  2 +-
 src/addons/mod/quiz/lang.json                        |  2 --
 src/addons/mod/quiz/pages/review/review.html         |  8 --------
 src/core/features/settings/lang.json                 |  8 +-------
 src/core/features/settings/pages/about/about.html    |  2 +-
 src/core/features/settings/pages/dev/dev.html        | 12 ++++++------
 8 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 56faabdba..29d1c1122 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -40,9 +40,9 @@
   "addon.block_learningplans.pluginname": "block_lp",
   "addon.block_myoverview.all": "block_myoverview",
   "addon.block_myoverview.allincludinghidden": "block_myoverview",
+  "addon.block_myoverview.aria:favourites": "block_myoverview",
   "addon.block_myoverview.aria:hiddencourses": "block_myoverview",
   "addon.block_myoverview.card": "block_myoverview",
-  "addon.block_myoverview.favouritesonly": "local_moodlemobileapp",
   "addon.block_myoverview.future": "block_myoverview",
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.lastaccessed": "block_myoverview",
@@ -878,8 +878,6 @@
   "addon.mod_quiz.requirepasswordmessage": "quizaccess_password",
   "addon.mod_quiz.returnattempt": "quiz",
   "addon.mod_quiz.review": "quiz",
-  "addon.mod_quiz.reviewofattempt": "local_moodlemobileapp",
-  "addon.mod_quiz.reviewofpreview": "local_moodlemobileapp",
   "addon.mod_quiz.showall": "quiz",
   "addon.mod_quiz.showeachpage": "quiz",
   "addon.mod_quiz.startattempt": "quiz",
@@ -2142,7 +2140,7 @@
   "core.sending": "chat",
   "core.serverconnection": "error",
   "core.settings.about": "local_moodlemobileapp",
-  "core.settings.accessibilitystatement": "local_moodlemobileapp",
+  "core.settings.accessstatement": "access",
   "core.settings.appsettings": "local_moodlemobileapp",
   "core.settings.appversion": "local_moodlemobileapp",
   "core.settings.cannotsyncloggedout": "local_moodlemobileapp",
@@ -2168,7 +2166,6 @@
   "core.settings.deviceos": "local_moodlemobileapp",
   "core.settings.disableall": "message",
   "core.settings.disabled": "lesson",
-  "core.settings.disabledfeatures": "tool_mobile",
   "core.settings.disallowed": "message",
   "core.settings.displayformat": "local_moodlemobileapp",
   "core.settings.enabledownloadsection": "local_moodlemobileapp",
@@ -2185,7 +2182,6 @@
   "core.settings.fontsizecharacter": "block_accessibility/char",
   "core.settings.forced": "message",
   "core.settings.forcedsetting": "local_moodlemobileapp",
-  "core.settings.forcesafeareamargins": "local_moodlemobileapp",
   "core.settings.general": "moodle",
   "core.settings.helpusimprove": "local_moodlemobileapp",
   "core.settings.ioscookies": "local_moodlemobileapp",
@@ -2200,25 +2196,21 @@
   "core.settings.navigatoruseragent": "local_moodlemobileapp",
   "core.settings.networkstatus": "local_moodlemobileapp",
   "core.settings.opensourcelicenses": "local_moodlemobileapp",
-  "core.settings.pluginstyles": "local_moodlemobileapp",
   "core.settings.preferences": "moodle",
   "core.settings.privacypolicy": "local_moodlemobileapp",
   "core.settings.publisher": "local_moodlemobileapp",
   "core.settings.pushid": "local_moodlemobileapp",
-  "core.settings.remotestyles": "local_moodlemobileapp",
   "core.settings.reportinbackground": "local_moodlemobileapp",
   "core.settings.screen": "local_moodlemobileapp",
   "core.settings.settings": "moodle",
   "core.settings.showdownloadoptions": "local_moodlemobileapp",
   "core.settings.siteinfo": "local_moodlemobileapp",
-  "core.settings.siteplugins": "local_moodlemobileapp",
   "core.settings.sites": "moodle",
   "core.settings.spaceusage": "local_moodlemobileapp",
   "core.settings.synchronization": "local_moodlemobileapp",
   "core.settings.synchronizenow": "local_moodlemobileapp",
   "core.settings.synchronizenowhelp": "local_moodlemobileapp",
   "core.settings.syncsettings": "local_moodlemobileapp",
-  "core.settings.textdirection": "local_moodlemobileapp",
   "core.settings.total": "moodle",
   "core.settings.wificonnection": "local_moodlemobileapp",
   "core.settings.youradev": "local_moodlemobileapp",
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index 8d747fcfe..2a6caf36b 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -41,7 +41,7 @@
 
         <core-spacer></core-spacer>
         <ion-item *ngIf="options.show.favourite">
-            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
+            <ion-label>{{ 'addon.block_myoverview.aria:favourites' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="options.favouriteSelected"></ion-toggle>
         </ion-item>
 
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 02a3c43fa..8030a7813 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,9 +1,9 @@
 {
     "all": "All",
     "allincludinghidden": "All (including archived)",
+    "aria:favourites": "Show starred courses only",
     "aria:hiddencourses": "Show archived courses",
     "card": "Card",
-    "favouritesonly": "Show starred courses only",
     "future": "Future",
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
diff --git a/src/addons/mod/quiz/lang.json b/src/addons/mod/quiz/lang.json
index 8f59f8656..a1db1a409 100644
--- a/src/addons/mod/quiz/lang.json
+++ b/src/addons/mod/quiz/lang.json
@@ -57,8 +57,6 @@
     "requirepasswordmessage": "To attempt this quiz you need to know the quiz password",
     "returnattempt": "Return to attempt",
     "review": "Review",
-    "reviewofattempt": "Review of attempt {{$a}}",
-    "reviewofpreview": "Review of preview",
     "showall": "Show all questions on one page",
     "showeachpage": "Show one page at a time",
     "startattempt": "Start attempt",
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 5399c89a1..2e3f97232 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -23,14 +23,6 @@
 
         <!-- Review summary -->
         <ion-card *ngIf="attempt">
-            <ion-card-header class="ion-text-wrap">
-                <ion-card-title>
-                    <ng-container *ngIf="attempt.preview">{{ 'addon.mod_quiz.reviewofpreview' | translate }}</ng-container>
-                    <ng-container *ngIf="!attempt.preview">
-                        {{ 'addon.mod_quiz.reviewofattempt' | translate:{$a: attempt.attempt} }}
-                    </ng-container>
-                </ion-card-title>
-            </ion-card-header>
             <ion-list>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index 76aa58bc0..29c25bbff 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -1,6 +1,6 @@
 {
     "about": "About",
-    "accessibilitystatement": "Accessibility statement",
+    "accessstatement": "Accessibility statement",
     "appsettings": "App settings",
     "appversion": "App version",
     "cannotsyncloggedout": "This site cannot be synchronised because you've logged out. Please try again when you're logged in the site again.",
@@ -26,7 +26,6 @@
     "deviceos": "Device OS",
     "disableall": "Disable notifications",
     "disabled": "Disabled",
-    "disabledfeatures": "Disabled features",
     "disallowed": "Locked off",
     "displayformat": "Display format",
     "enabledownloadsection": "Enable download sections",
@@ -43,7 +42,6 @@
     "fontsizecharacter": "A",
     "forced": "Locked",
     "forcedsetting": "This setting has been forced by your site configuration.",
-    "forcesafeareamargins": "Force safe area margins",
     "general": "General",
     "helpusimprove": "Help us improve this app",
     "ioscookies": "Cross-Website Tracking",
@@ -58,25 +56,21 @@
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Internet connection status",
     "opensourcelicenses": "Open Source Licences",
-    "pluginstyles": "Enable site plugin styles",
     "preferences": "Preferences",
     "privacypolicy": "Privacy policy",
     "publisher": "Publisher",
     "pushid": "Push notifications ID",
-    "remotestyles": "Enable remote styles",
     "reportinbackground": "Report errors automatically",
     "screen": "Screen information",
     "settings": "Settings",
     "showdownloadoptions": "Show download options",
     "siteinfo": "Site info",
-    "siteplugins": "Site plugins",
     "sites": "Sites",
     "spaceusage": "Space usage",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchronise now",
     "synchronizenowhelp": "Synchronising a site will send pending changes and all offline activity stored in the device and will synchronise some data like messages and notifications.",
     "syncsettings": "Synchronisation settings",
-    "textdirection": "Text direction",
     "total": "Total",
     "wificonnection": "Wi-Fi connection",
     "youradev": "You are now a developer"
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 7417a8084..bcab19c6b 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -25,7 +25,7 @@
         <ion-item *ngIf="a11yStatement" class="ion-text-wrap" button core-link auto-login="no" [href]="a11yStatement" detail="true"
             detailIcon="open-outline">
             <ion-icon name="fas-universal-access" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.settings.accessibilitystatement' | translate }}</ion-label>
+            <ion-label>{{ 'core.settings.accessstatement' | translate }}</ion-label>
         </ion-item>
         <ion-item *ngIf="feedbackFormUrl" class="ion-text-wrap" button core-link [href]="feedbackFormUrl" detail="true"
             detailIcon="open-outline">
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index 61d6f0f52..d7dd7f061 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -19,28 +19,28 @@
     <ion-list class="list-item-limited-width">
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <h2>{{ 'core.settings.textdirection' | translate }}</h2>
+                <h2>Text direction</h2>
                 <p>{{ direction }}</p>
             </ion-label>
             <ion-toggle [(ngModel)]="rtl" (ionChange)="RTLChanged()"></ion-toggle>
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <h2>{{ 'core.settings.forcesafeareamargins' | translate }}</h2>
+                <h2>Force safe area margins</h2>
             </ion-label>
             <ion-toggle [(ngModel)]="forceSafeAreaMargins" (ionChange)="safeAreaChanged()"></ion-toggle>
         </ion-item>
         <ng-container *ngIf="siteId">
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>{{ 'core.settings.remotestyles' | translate }} <ion-badge>{{remoteStylesCount}}</ion-badge>
+                    <h2>Enable remote styles <ion-badge>{{remoteStylesCount}}</ion-badge>
                     </h2>
                 </ion-label>
                 <ion-toggle [(ngModel)]="remoteStyles" (ionChange)="remoteStylesChanged()"></ion-toggle>
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>{{ 'core.settings.pluginstyles' | translate }} <ion-badge>{{pluginStylesCount}}</ion-badge>
+                    <h2>Enable site plugin styles <ion-badge>{{pluginStylesCount}}</ion-badge>
                     </h2>
                 </ion-label>
                 <ion-toggle [(ngModel)]="pluginStyles" (ionChange)="pluginStylesChanged()"></ion-toggle>
@@ -48,7 +48,7 @@
 
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'core.settings.disabledfeatures' | translate }}</h2>
+                    <h2>Disabled features</h2>
                 </ion-label>
             </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngFor="let feature of disabledFeatures">
@@ -59,7 +59,7 @@
 
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'core.settings.siteplugins' | translate }}</h2>
+                    <h2>Site plugins</h2>
                 </ion-label>
             </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngFor="let plugin of sitePlugins">