Merge pull request #4401 from crazyserver/MOBILE-4653

Mobile 4653

Author: dpalou

src/addons/badges/lang.json

@@ -19,8 +19,8 @@
     "issueremail": "Email",
     "issuername": "Issuer name",
     "issuerurl": "Issuer URL",
-    "moredetails": "More details",
     "language": "Language",
+    "moredetails": "More details",
     "nobadges": "There are currently no badges available for users to earn.",
     "relatedbages": "Related badges",
     "version": "Version"

src/addons/calendar/components/calendar/calendar.ts

@@ -520,7 +520,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      */
     getPreviousItem(item: MonthBasicData): MonthBasicData | null {
         return {
-            dayJS: item.dayJS.clone().subtract(1, 'month'),
+            dayJS: item.dayJS.subtract(1, 'month'),
         };
     }
 
@@ -529,7 +529,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      */
     getNextItem(item: MonthBasicData): MonthBasicData | null {
         return {
-            dayJS: item.dayJS.clone().add(1, 'month'),
+            dayJS: item.dayJS.add(1, 'month'),
         };
     }
 

src/addons/calendar/pages/day/day.ts

@@ -416,7 +416,7 @@ export default class AddonCalendarDayPage implements OnInit, OnDestroy {
             if (selectedDay) {
                 // Use current time but in the specified day.
                 const now = dayjs.tz();
-                params.timestamp = selectedDay.dayJS.clone().set({ hour: now.hour(), minute: now.minute() }).valueOf();
+                params.timestamp = selectedDay.dayJS.set({ hour: now.hour(), minute: now.minute() }).valueOf();
             }
         }
 
@@ -665,7 +665,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
      */
     getPreviousItem(item: DayBasicData): DayBasicData | null {
         return {
-            dayJS: item.dayJS.clone().subtract(1, 'day'),
+            dayJS: item.dayJS.subtract(1, 'day'),
         };
     }
 
@@ -674,7 +674,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
      */
     getNextItem(item: DayBasicData): DayBasicData | null {
         return {
-            dayJS: item.dayJS.clone().add(1, 'day'),
+            dayJS: item.dayJS.add(1, 'day'),
         };
     }
 

src/addons/calendar/services/calendar-helper.ts

@@ -132,7 +132,7 @@ export class AddonCalendarHelperProvider {
         const result = {};
 
         events.forEach((event) => {
-            const treatedDay = dayjs.tz(event.timestart * 1000);
+            let treatedDay = dayjs.tz(event.timestart * 1000);
             const endDay = dayjs.tz((event.timestart + event.timeduration) * 1000);
 
             // Add the event to all the days it lasts.
@@ -148,7 +148,7 @@ export class AddonCalendarHelperProvider {
                 }
                 result[monthId][day].push(event);
 
-                treatedDay.add(1, 'day'); // Treat next day.
+                treatedDay = treatedDay.add(1, 'day'); // Treat next day.
             }
         });
 

src/addons/calendar/services/calendar.ts

@@ -543,10 +543,10 @@ export class AddonCalendarProvider {
         if (date.isSame(today, 'day')) {
             return Translate.instant('addon.calendar.today');
         }
-        if (date.isSame(today.clone().subtract(1, 'days'), 'day')) {
+        if (date.isSame(today.subtract(1, 'days'), 'day')) {
             return Translate.instant('addon.calendar.yesterday');
         }
-        if (date.isSame(today.clone().add(1, 'days'), 'day')) {
+        if (date.isSame(today.add(1, 'days'), 'day')) {
             return Translate.instant('addon.calendar.tomorrow');
         }
 

src/addons/coursecompletion/lang.json

@@ -1,10 +1,10 @@
 {
-    "confirmselfcompletion": "Confirm self completion",
     "complete": "Complete",
     "completecourse": "Complete course",
     "completed": "Completed",
     "completiondate": "Completion date",
     "completionmenuitem": "Completion",
+    "confirmselfcompletion": "Confirm self completion",
     "couldnotloadreport": "Could not load the course completion report. Please try again later.",
     "coursecompletion": "Course completion",
     "criteria": "Criteria",

src/addons/mod/assign/lang.json

@@ -13,10 +13,10 @@
     "attempt": "Attempt {{$a}}",
     "attempthistory": "Previous attempts",
     "attemptnumber": "Attempt number",
+    "attemptreopenmethod": "Grant attempts",
     "attemptreopenmethod_automatic": "Automatically",
     "attemptreopenmethod_manual": "Manually",
     "attemptreopenmethod_untilpass": "Automatically until pass",
-    "attemptreopenmethod": "Grant attempts",
     "attemptsettings": "Attempt settings",
     "beginassignment": "Begin assignment",
     "caneditsubmission": "You can edit your submission and submit it after the time limit has expired, but it will be marked as late.",

src/addons/mod/h5pactivity/lang.json

@@ -36,6 +36,6 @@
     "score_out_of": "{{$a.rawscore}} out of {{$a.maxscore}}",
     "startdate": "Start date",
     "totalscore": "Total score",
-    "viewattempt": "View attempt {{$a}}",
-    "view_report": "View report"
+    "view_report": "View report",
+    "viewattempt": "View attempt {{$a}}"
 }

src/addons/qtype/numerical/lang.json

@@ -1,6 +1,6 @@
 {
-    "pleaseenterananswer": "Please enter an answer.",
     "invalidnumber": "You must enter a valid number.",
-    "unitnotselected": "You must select a unit.",
-    "invalidnumbernounit": "You must enter a valid number. Do not include a unit in your response."
+    "invalidnumbernounit": "You must enter a valid number. Do not include a unit in your response.",
+    "pleaseenterananswer": "Please enter an answer.",
+    "unitnotselected": "You must select a unit."
 }