Merge pull request #4034 from crazyserver/MOBILE-4470

Mobile 4470

scripts/langindex.json

@@ -1,5 +1,6 @@
 {
   "addon.badges.alignment": "badges",
+  "addon.badges.awardedto": "badges",
   "addon.badges.badgedetails": "badges",
   "addon.badges.badges": "badges",
   "addon.badges.bendorsement": "badges",
@@ -22,7 +23,6 @@
   "addon.badges.noalignment": "badges",
   "addon.badges.nobadges": "badges",
   "addon.badges.norelated": "badges",
-  "addon.badges.recipientdetails": "badges",
   "addon.badges.relatedbages": "badges",
   "addon.badges.version": "badges",
   "addon.badges.warnexpired": "badges",
@@ -142,7 +142,7 @@
   "addon.calendar.invalidtimedurationuntil": "calendar",
   "addon.calendar.mon": "calendar",
   "addon.calendar.monday": "calendar",
-  "addon.calendar.monthlyview": "calendar",
+  "addon.calendar.monthlyview": "local_moodlemobileapp",
   "addon.calendar.monthnext": "calendar",
   "addon.calendar.monthprev": "calendar",
   "addon.calendar.newevent": "calendar",
@@ -2097,7 +2097,6 @@
   "core.login.connecttomoodleapp": "local_moodlemobileapp",
   "core.login.connecttoworkplaceapp": "local_moodlemobileapp",
   "core.login.createaccount": "moodle",
-  "core.login.createuserandpass": "moodle",
   "core.login.credentialsdescription": "local_moodlemobileapp",
   "core.login.credentialshelp": "local_moodlemobileapp",
   "core.login.credentialssupportsubject": "local_moodlemobileapp",
@@ -2199,7 +2198,6 @@
   "core.login.siteurlrequired": "local_moodlemobileapp",
   "core.login.startsignup": "moodle",
   "core.login.stillcantconnect": "local_moodlemobileapp",
-  "core.login.supplyinfo": "moodle",
   "core.login.toggleremove": "local_moodlemobileapp",
   "core.login.unsupportedsite": "local_moodlemobileapp",
   "core.login.unsupportedsitemessage": "local_moodlemobileapp",

src/addons/badges/lang.json

@@ -1,5 +1,6 @@
 {
     "alignment": "Alignment",
+    "awardedto": "Awarded to {{$a}}",
     "badgedetails": "Badge details",
     "badges": "Badges",
     "bendorsement": "Endorsement",
@@ -22,7 +23,6 @@
     "noalignment": "This badge does not have any external skills or standards specified.",
     "nobadges": "There are currently no badges available for users to earn.",
     "norelated": "This badge does not have any related badges.",
-    "recipientdetails": "Recipient details",
     "relatedbages": "Related badges",
     "version": "Version",
     "warnexpired": "(This badge has expired!)"

src/addons/badges/pages/issued-badge/issued-badge.html

@@ -25,19 +25,13 @@
             </ion-item>
         </ion-item-group>
 
-        <ion-item-group *ngIf="user">
+        <ion-item *ngIf="user">
-            <ion-item-divider>
+            <ion-label>
-                <ion-label>
+                <p class="item-heading">
-                    <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
+                    {{ 'addon.badges.awardedto' | translate: {$a: user.fullname } }}
-                </ion-label>
+                </p>
-            </ion-item-divider>
+            </ion-label>
-            <ion-item class="ion-text-wrap">
+        </ion-item>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.name' | translate}}</p>
-                    <p>{{ user.fullname }}</p>
-                </ion-label>
-            </ion-item>
-        </ion-item-group>
 
         <ng-container *ngIf="badge">
             <ion-item-group>

src/core/classes/sites/authenticated-site.ts

@@ -72,7 +72,7 @@ export class CoreAuthenticatedSite extends CoreUnauthenticatedSite {
         '4.1': 2022112800,
         '4.2': 2023042400,
         '4.3': 2023100900,
-        '4.4': 2024012500, // @TODO correct the final release date.
+        '4.4': 2024042200,
     };
 
     // Possible cache update frequencies.

src/core/features/login/lang.json

@@ -15,7 +15,6 @@
     "connecttomoodleapp": "You are trying to connect to a regular Moodle site. Please download the official Moodle app to access this site.",
     "connecttoworkplaceapp": "You are trying to connect to a Moodle Workplace site. Please download the Moodle Workplace app to access this site.",
     "createaccount": "Create my new account",
-    "createuserandpass": "Choose your username and password",
     "credentialsdescription": "Please provide your username and password to log in.",
     "credentialshelp": "If you have problems logging in, try again later or contact your school or learning provider.",
     "credentialssupportsubject": "Need help logging in",
@@ -117,7 +116,6 @@
     "siteurlrequired": "Site URL required i.e <i>https://campus.example.edu</i>",
     "startsignup": "Create new account",
     "stillcantconnect": "Still can't connect?",
-    "supplyinfo": "More details",
     "toggleremove": "Edit accounts list",
     "unsupportedsite": "Site not accessible through the app",
     "unsupportedsitemessage": "{{site}} can't be accessed through this app.<br><br>You can still access it using a web browser.",

src/core/features/login/pages/email-signup/email-signup.html

@@ -90,11 +90,6 @@
                     </ion-item>
 
                     <!-- Username and password. -->
-                    <ion-item-divider class="ion-text-wrap">
-                        <ion-label>
-                            <h2>{{ 'core.login.createuserandpass' | translate }}</h2>
-                        </ion-label>
-                    </ion-item-divider>
                     <ion-item class="ion-text-wrap">
                         <ion-input labelPlacement="stacked" type="text" name="username"
                             placeholder="{{ 'core.login.username' | translate }}" formControlName="username" autocapitalize="none"
@@ -116,12 +111,6 @@
                         <core-input-errors [control]="signupForm.controls.password" [errorMessages]="passwordErrors" />
                     </ion-item>
 
-                    <!-- More details. -->
-                    <ion-item-divider class="ion-text-wrap">
-                        <ion-label>
-                            <h2>{{ 'core.login.supplyinfo' | translate }}</h2>
-                        </ion-label>
-                    </ion-item-divider>
                     <ion-item class="ion-text-wrap">
                         <ion-input labelPlacement="stacked" type="email" name="email" placeholder="{{ 'core.user.email' | translate }}"
                             formControlName="email" autocapitalize="none" autocorrect="off">