diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html index f9576466d..b3e3a4caf 100644 --- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -5,8 +5,9 @@
- - + + diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html index 821e6874b..e8f1b307f 100644 --- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html +++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html @@ -4,9 +4,8 @@
- - + (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate"> + {{prefetchCoursesData.badge}} diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html index b8c52e1c2..5623b314a 100644 --- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html +++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html @@ -4,9 +4,8 @@
- - + (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate"> + {{prefetchCoursesData.badge}} diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html index 67db5d061..aa53319ec 100644 --- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html +++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html @@ -7,6 +7,8 @@ [title]="event.name"> + + {{ event.iconTitle }}

diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts index c5b71e4fd..0b29a7b80 100644 --- a/src/addons/block/timeline/components/events/events.ts +++ b/src/addons/block/timeline/components/events/events.ts @@ -103,6 +103,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges { return start <= event.timesort; }).map((event) => { event.iconUrl = CoreCourse.getModuleIconSrc(event.icon.component); + event.iconTitle = event.modulename && CoreCourse.translateModuleName(event.modulename); return event; }); @@ -145,6 +146,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges { type AddonBlockTimelineEvent = AddonCalendarEvent & { iconUrl?: string; + iconTitle?: string; }; type AddonBlockTimelineEventFilteredEvent = { diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html index 80655f4c0..95ea4967d 100644 --- a/src/addons/blog/pages/entries/entries.html +++ b/src/addons/blog/pages/entries/entries.html @@ -71,7 +71,8 @@ - {{entry.lastmodified | coreTimeAgo}} + {{entry.lastmodified | coreTimeAgo}} diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html index d4eb63e83..d80b34e36 100644 --- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html +++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html @@ -13,16 +13,16 @@ - - + +

{{ periodName }}

- - + +
@@ -42,8 +42,8 @@ -

{{ day.mday }}

@@ -55,16 +55,23 @@
-

+

- - + + + {{ event.timestart * 1000 | coreFormatDate: timeFormat }} + + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} + {{event.name}} -

+

{{ 'core.nummore' | translate:{$a: day.filteredEvents.length - 3} }} diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss index 6a8f387cc..b6c5e1d61 100644 --- a/src/addons/calendar/components/calendar/calendar.scss +++ b/src/addons/calendar/components/calendar/calendar.scss @@ -70,6 +70,7 @@ margin-bottom: 0.6em; overflow: hidden; white-space: nowrap; + color: var(--text-color); &.addon-calendar-event-past { opacity: 0.5; diff --git a/src/addons/calendar/components/filter/addon-calendar-filter-popover.html b/src/addons/calendar/components/filter/addon-calendar-filter-popover.html index d89538bf2..5d998548a 100644 --- a/src/addons/calendar/components/filter/addon-calendar-filter-popover.html +++ b/src/addons/calendar/components/filter/addon-calendar-filter-popover.html @@ -1,6 +1,6 @@ - + {{ 'addon.calendar.' + type + 'events' | translate}} diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html index 0f91e2f50..32b83adf7 100644 --- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html +++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html @@ -6,20 +6,26 @@ - - + + + + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} +

- + {{ 'core.notsent' | translate }} - + {{ 'core.deletedoffline' | translate }} diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index 1383f2126..f2aed2d70 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -6,7 +6,7 @@ {{ 'addon.calendar.calendarevents' | translate }} - + - - + +

{{ periodName }}

- - + +
- + - + {{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }} @@ -61,20 +61,26 @@ - - + + + + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} +

- + {{ 'core.notsent' | translate }} - + {{ 'core.deletedoffline' | translate }}
@@ -85,7 +91,7 @@ - + diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html index 92d016298..3de473f41 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.html +++ b/src/addons/calendar/pages/edit-event/edit-event.html @@ -120,9 +120,10 @@
- - - + + + {{ 'core.showmore' | translate }} {{ 'core.showless' | translate }} diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html index 0d3f8a5bf..a226b8144 100644 --- a/src/addons/calendar/pages/event/event.html +++ b/src/addons/calendar/pages/event/event.html @@ -5,7 +5,12 @@
- + + + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} + @@ -38,7 +43,7 @@ - + {{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendarevent' | translate} }} @@ -48,17 +53,21 @@ - + + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} +

{{ 'addon.calendar.eventname' | translate }}

+ [contextInstanceId]="event.contextInstanceId">

- {{ 'core.deletedoffline' | translate }} + {{ 'core.deletedoffline' | translate }}
@@ -67,7 +76,7 @@

- {{ 'core.deletedoffline' | translate }} + {{ 'core.deletedoffline' | translate }}
@@ -144,9 +153,9 @@

{{ reminder.time * 1000 | coreFormatDate }}

- +
diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html index 3795ee0e5..7f1718b39 100644 --- a/src/addons/calendar/pages/index/index.html +++ b/src/addons/calendar/pages/index/index.html @@ -6,7 +6,7 @@ {{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }} - + - + {{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendar' | translate} }} @@ -49,7 +49,7 @@ - + diff --git a/src/addons/calendar/pages/list/list.html b/src/addons/calendar/pages/list/list.html index 46bbcc1aa..d3b47c8ae 100644 --- a/src/addons/calendar/pages/list/list.html +++ b/src/addons/calendar/pages/list/list.html @@ -6,7 +6,7 @@ {{ 'addon.calendar.calendarevents' | translate }} - + - + {{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendar' | translate} }} @@ -44,11 +44,18 @@ - - + +

+ + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} + @@ -64,11 +71,11 @@

- + {{ 'core.notsent' | translate }} - + {{ 'core.deletedoffline' | translate }} @@ -82,7 +89,7 @@ - + diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts index 7ebe73090..ed5b47cff 100644 --- a/src/addons/calendar/services/calendar-helper.ts +++ b/src/addons/calendar/services/calendar-helper.ts @@ -189,6 +189,7 @@ export class AddonCalendarHelperProvider { if (event.modulename) { eventFormatted.eventIcon = CoreCourse.getModuleIconSrc(event.modulename); eventFormatted.moduleIcon = eventFormatted.eventIcon; + eventFormatted.iconTitle = CoreCourse.translateModuleName(event.modulename); } eventFormatted.formattedType = AddonCalendar.getEventType(event); diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts index e9d725c08..a16a3e4d1 100644 --- a/src/addons/calendar/services/calendar.ts +++ b/src/addons/calendar/services/calendar.ts @@ -2250,6 +2250,7 @@ export type AddonCalendarEventToDisplay = Partial & deleted?: boolean; // Calculated in the app. Whether it has been deleted in offline. encodedLocation?: SafeUrl; // Calculated in the app. Sanitized location link. eventIcon?: string; // Calculated in the app. Event icon. + iconTitle?: string; moduleIcon?: string; // Calculated in the app. Module icon. formattedType: string; // Calculated in the app. Formatted type. duration?: number; // Calculated in the app. Duration of offline event. diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html index 82327f0ad..2e9af0824 100644 --- a/src/addons/competency/pages/competency/competency.html +++ b/src/addons/competency/pages/competency/competency.html @@ -75,7 +75,7 @@

- - - + {{ 'addon.coursecompletion.nottracked' | translate }} diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html index 42e3f3a6f..ad864180b 100644 --- a/src/addons/messages/components/conversation-info/conversation-info.html +++ b/src/addons/messages/components/conversation-info/conversation-info.html @@ -3,7 +3,7 @@ {{ 'addon.messages.groupinfo' | translate }} - + @@ -39,7 +39,8 @@

{{ member.fullname }} - +

diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html index 952b7dc31..e80cd7637 100644 --- a/src/addons/messages/pages/contacts/contacts.html +++ b/src/addons/messages/pages/contacts/contacts.html @@ -5,8 +5,8 @@ {{ 'addon.messages.contacts' | translate }} - - + + @@ -36,7 +36,8 @@

- +

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html index 0bdd89574..1d34ae74c 100644 --- a/src/addons/messages/pages/discussion/discussion.html +++ b/src/addons/messages/pages/discussion/discussion.html @@ -13,17 +13,18 @@ - + + [attr.aria-label]="'addon.messages.mutedconversation' | translate">

- + @@ -82,7 +83,7 @@ {{ 'addon.messages.newmessages' | translate }} - + {{ members[message.useridfrom].fullname }}

{{ message.timecreated | coreFormatDate: "strftimetime" }} - + + + @@ -111,7 +114,7 @@ - +
@@ -126,7 +129,7 @@ - + {{ newMessages }} diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html index 921207b0e..68f7cbabc 100644 --- a/src/addons/messages/pages/discussions-35/discussions.html +++ b/src/addons/messages/pages/discussions-35/discussions.html @@ -27,7 +27,7 @@ - +

{{ 'addon.messages.contacts' | translate }}

diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html index 004a464d6..aec8e148b 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.html +++ b/src/addons/messages/pages/group-conversations/group-conversations.html @@ -5,11 +5,11 @@ {{ 'addon.messages.messages' | translate }} - - + + - + @@ -27,14 +27,16 @@ - +

{{ 'addon.messages.contacts' | translate }}

{{contactRequestsCount}}
- - - + + + {{ 'core.favourites' | translate }} ({{ favourites.count }}) {{ favourites.unread }} @@ -53,9 +55,11 @@ - - - + + + {{ 'addon.messages.groupconversations' | translate }} ({{ group.count }}) {{ group.unread }} @@ -73,9 +77,11 @@ - - - + + + {{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }}) {{ individual.unread }} diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html index 74c90d8d7..c76172382 100644 --- a/src/addons/messages/pages/search/search.html +++ b/src/addons/messages/pages/search/search.html @@ -47,8 +47,10 @@

- - + + +

diff --git a/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html b/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html index 8b50df00c..c7ae573a0 100644 --- a/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html +++ b/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html @@ -3,7 +3,7 @@ {{ plugin.name }} - + diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html index 04e5dd3e5..5cb5d471d 100644 --- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html @@ -49,7 +49,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -128,7 +128,7 @@ - + {{ 'addon.mod_assign.'+summary.warnofungroupedusers | translate }} diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html index 83b914e6d..e6822a44b 100644 --- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html +++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html @@ -225,8 +225,9 @@

{{ 'addon.mod_assign.currentgrade' | translate }}

- - + + @@ -348,12 +349,12 @@ - +

{{ 'addon.mod_assign.cannotgradefromapp' | translate }}

{{ 'core.openinbrowser' | translate }} - +
diff --git a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html index 9e615ff11..5032d3482 100644 --- a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html +++ b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html @@ -11,13 +11,13 @@
- - + +
- - {{ 'core.notsent' | translate }} + {{ 'core.notsent' | translate }}
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html index 6ffcd9680..1f7c38d82 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.html +++ b/src/addons/mod/assign/pages/submission-list/submission-list.html @@ -75,7 +75,7 @@ - + {{ 'addon.mod_assign.notallparticipantsareshown' | translate }} diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html index 87a5723dc..83c7ae129 100644 --- a/src/addons/mod/book/components/index/addon-mod-book-index.html +++ b/src/addons/mod/book/components/index/addon-mod-book-index.html @@ -1,7 +1,7 @@ - + - - + + + +
diff --git a/src/addons/mod/book/components/toc/toc.html b/src/addons/mod/book/components/toc/toc.html index e1b745352..9a1e64faf 100644 --- a/src/addons/mod/book/components/toc/toc.html +++ b/src/addons/mod/book/components/toc/toc.html @@ -3,7 +3,7 @@ {{ 'addon.mod_book.toc' | translate }} - + diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html index b4aa0ca7d..8300e280a 100644 --- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html +++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html @@ -32,7 +32,7 @@ - + {{ 'addon.mod_chat.sessionstart' | translate:{$a: chatInfo} }} diff --git a/src/addons/mod/chat/components/users-modal/users-modal.html b/src/addons/mod/chat/components/users-modal/users-modal.html index aef96de19..90c23b211 100644 --- a/src/addons/mod/chat/components/users-modal/users-modal.html +++ b/src/addons/mod/chat/components/users-modal/users-modal.html @@ -6,7 +6,7 @@ {{ 'addon.mod_chat.currentusers' | translate }} - + @@ -21,11 +21,11 @@

{{ user.fullname }}

- + {{ 'addon.mod_chat.talk' | translate }} - + {{ 'addon.mod_chat.beep' | translate }} diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html index b8f2c39ae..f0197175d 100644 --- a/src/addons/mod/chat/pages/chat/chat.html +++ b/src/addons/mod/chat/pages/chat/chat.html @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@
- + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageenter' | translate:{$a: message.userfullname} }} @@ -34,7 +34,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageexit' | translate:{$a: message.userfullname} }} @@ -42,7 +42,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messagebeepseveryone' | translate:{$a: message.userfullname} }} @@ -51,7 +51,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messagebeepsyou' | translate:{$a: message.userfullname} }} @@ -60,7 +60,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepWho} }} @@ -68,7 +68,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ message.userfullname }} - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageenter' | translate:{$a: message.userfullname} }} @@ -29,7 +29,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageexit' | translate:{$a: message.userfullname} }} @@ -37,7 +37,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messagebeepseveryone' | translate:{$a: message.userfullname} }} @@ -46,7 +46,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messagebeepsyou' | translate:{$a: message.userfullname} }} @@ -55,7 +55,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepWho} }} @@ -63,7 +63,7 @@ - + {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ message.userfullname }} - +

{{ 'addon.mod_choice.previewonly' | translate:{$a: openTimeReadable} }}

{{ 'addon.mod_choice.notopenyet' | translate:{$a: openTimeReadable} }}

@@ -45,7 +45,7 @@ - +

{{ 'addon.mod_choice.yourselection' | translate }} @@ -61,7 +61,7 @@ - + {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} @@ -69,7 +69,7 @@ - + {{ publishInfo | translate }} @@ -111,7 +111,7 @@ - + {{ 'addon.mod_choice.resultsnotsynced' | translate }} @@ -153,7 +153,7 @@ - +

{{ 'addon.mod_choice.noresultsviewable' | translate }}

diff --git a/src/addons/mod/data/components/action/addon-mod-data-action.html b/src/addons/mod/data/components/action/addon-mod-data-action.html index d87b725a0..65bb39b40 100644 --- a/src/addons/mod/data/components/action/addon-mod-data-action.html +++ b/src/addons/mod/data/components/action/addon-mod-data-action.html @@ -1,26 +1,26 @@ - - + + - - + + - - + + - - + + - - + + - + [attr.aria-label]="'addon.mod_data.disapprove' | translate"> + - + - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -66,21 +66,21 @@ - + {{ 'addon.mod_data.notopenyet' | translate:{$a: timeAvailableFromReadable} }} - + {{ 'addon.mod_data.expired' | translate:{$a: timeAvailableToReadable} }} > - + {{ 'addon.mod_data.entrieslefttoaddtoview' | translate:{$a: {entrieslefttoview: access.entrieslefttoview} } }} @@ -89,7 +89,7 @@ > - + {{ 'addon.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }} @@ -121,14 +121,14 @@ - + {{ 'core.previous' | translate }} {{ 'core.next' | translate }} - + @@ -146,6 +146,6 @@ - + diff --git a/src/addons/mod/data/components/search/search.html b/src/addons/mod/data/components/search/search.html index 83de1a171..bb2f77f52 100644 --- a/src/addons/mod/data/components/search/search.html +++ b/src/addons/mod/data/components/search/search.html @@ -6,7 +6,7 @@ {{ 'addon.mod_data.search' | translate }} - + @@ -60,7 +60,7 @@
- + {{ 'addon.mod_data.search' | translate }}
diff --git a/src/addons/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html b/src/addons/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html index cb3e8c524..5851d3765 100644 --- a/src/addons/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html +++ b/src/addons/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html @@ -13,7 +13,7 @@
- + {{ 'addon.mod_data.mylocation' | translate }}
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html index 48f018385..5fec6445b 100644 --- a/src/addons/mod/data/pages/entry/entry.html +++ b/src/addons/mod/data/pages/entry/entry.html @@ -19,7 +19,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -66,14 +66,14 @@ - + {{ 'core.previous' | translate }} {{ 'core.next' | translate }} - + diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html index e5c8a6962..68d96aa44 100644 --- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html +++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html @@ -97,21 +97,21 @@ - + {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} - + {{ 'addon.mod_feedback.feedback_is_not_open' | translate }} - + {{ 'addon.mod_feedback.this_feedback_is_already_submitted' | translate }} @@ -149,7 +149,7 @@ - + {{ 'addon.mod_feedback.preview' | translate }} @@ -161,7 +161,7 @@ {{ 'addon.mod_feedback.continue_the_form' | translate }} - + @@ -180,7 +180,7 @@ - + {{ warning }} diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html index efbc93510..5b1487bb0 100644 --- a/src/addons/mod/feedback/pages/form/form.html +++ b/src/addons/mod/feedback/pages/form/form.html @@ -106,7 +106,7 @@
- + {{ 'addon.mod_feedback.captchaofflinewarning' | translate }}
@@ -117,14 +117,14 @@ - + {{ 'addon.mod_feedback.previous_page' | translate }} {{ 'addon.mod_feedback.next_page' | translate }} - + @@ -139,7 +139,7 @@ - +

{{ 'addon.mod_feedback.this_feedback_is_already_submitted' | translate }} @@ -161,14 +161,14 @@ - + {{ 'addon.mod_feedback.completed_feedbacks' | translate }} {{ 'core.continue' | translate }} - + diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html index 814bcc3da..46a73cbd4 100644 --- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html +++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html @@ -32,7 +32,7 @@ - +

{{folder.filename}}

diff --git a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html index 5332499ea..c4d151ceb 100644 --- a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html +++ b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html @@ -1,35 +1,35 @@ - +

{{ 'addon.mod_forum.lockdiscussion' | translate }}

- +

{{ 'addon.mod_forum.unlockdiscussion' | translate }}

- +

{{ 'addon.mod_forum.pindiscussion' | translate }}

- +

{{ 'addon.mod_forum.unpindiscussion' | translate }}

- +

{{ 'addon.mod_forum.addtofavourites' | translate }}

- +

{{ 'addon.mod_forum.removefromfavourites' | translate }}

diff --git a/src/addons/mod/forum/components/edit-post/edit-post.html b/src/addons/mod/forum/components/edit-post/edit-post.html index c809c770b..1a4ac2bed 100644 --- a/src/addons/mod/forum/components/edit-post/edit-post.html +++ b/src/addons/mod/forum/components/edit-post/edit-post.html @@ -3,7 +3,7 @@ {{ 'addon.mod_forum.yourreply' | translate }} - + @@ -25,9 +25,10 @@ (contentChanged)="onMessageChange($event)">
- - - + + + {{ 'addon.mod_forum.advanced' | translate }} diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html index 7563b457d..60a48356d 100644 --- a/src/addons/mod/forum/components/index/index.html +++ b/src/addons/mod/forum/components/index/index.html @@ -50,7 +50,7 @@ - + {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} @@ -58,7 +58,7 @@ - + {{ availabilityMessage }} @@ -85,8 +85,10 @@

- - + + @@ -96,7 +98,7 @@ fill="clear" color="dark" [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event, discussion)"> - +

@@ -105,12 +107,15 @@

{{discussion.userfullname}}

-

{{ discussion.groupname }}

+

+ + {{ discussion.groupname }} +

{{discussion.created * 1000 | coreFormatDate: "strftimerecentfull"}}

- + {{ 'core.notsent' | translate }}

@@ -119,7 +124,7 @@ class="ion-text-center addon-mod-forum-discussion-more-info"> - {{ 'addon.mod_forum.lastpost' | translate }} + {{ 'addon.mod_forum.lastpost' | translate }} {{ discussion.timemodified | coreTimeAgo }} @@ -130,7 +135,7 @@ - + {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }} @@ -151,7 +156,7 @@ - + diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html index 07fe05d72..10c2c85ae 100644 --- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html +++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html @@ -1,12 +1,12 @@ - +

{{ 'addon.mod_forum.edit' | translate }}

- +

{{ 'addon.mod_forum.delete' | translate }}

{{ 'core.discard' | translate }}

@@ -18,7 +18,7 @@
- +

{{ 'core.openinbrowser' | translate }}

diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html index 2d67a8497..a79e15d6b 100644 --- a/src/addons/mod/forum/components/post/post.html +++ b/src/addons/mod/forum/components/post/post.html @@ -4,9 +4,11 @@

- + - - + - +

@@ -33,23 +34,24 @@

{{post.author.fullname}}

- {{ group.name }} + + {{ group.name }}

{{post.timecreated * 1000 | coreFormatDate: "strftimerecentfull"}}

-

{{ 'core.notsent' | translate }}

+

+ {{ 'core.notsent' | translate }} +

- - + - - +
@@ -92,7 +94,7 @@ [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id" (click)="showReplyForm()"> - + {{ 'addon.mod_forum.reply' | translate }}
@@ -120,12 +122,11 @@ - + - - - - + + {{ 'addon.mod_forum.advanced' | translate }} diff --git a/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html b/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html index 6d2f030a9..421d7fb01 100644 --- a/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html +++ b/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html @@ -3,7 +3,7 @@ {{ 'core.sort' | translate }} - + diff --git a/src/addons/mod/forum/lang.json b/src/addons/mod/forum/lang.json index e03b2dbf9..9e5595213 100644 --- a/src/addons/mod/forum/lang.json +++ b/src/addons/mod/forum/lang.json @@ -29,6 +29,7 @@ "errorgetforum": "Error getting forum data.", "errorgetgroups": "Error getting group settings.", "errorposttoallgroups": "Could not create new discussion in all groups.", + "favourites": "Starred", "favouriteupdated": "Your star option has been updated.", "forumnodiscussionsyet": "There are no discussions yet in this forum.", "group": "Group", diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html index b89c04edd..2f85f8fb2 100644 --- a/src/addons/mod/forum/pages/discussion/discussion.html +++ b/src/addons/mod/forum/pages/discussion/discussion.html @@ -69,7 +69,7 @@ - + {{ 'core.hasdatatosync' | translate:{$a: discussionStr} }} @@ -77,14 +77,14 @@ - + {{ availabilityMessage }} - + {{ 'addon.mod_forum.discussionlocked' | translate }} diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html index c19e657f1..6cb66cbee 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html @@ -31,11 +31,10 @@ (contentChanged)="onMessageChange($event)"> - - - - - + + + {{ 'addon.mod_forum.advanced' | translate }} diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html index 43416ef4a..719cd2097 100644 --- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html +++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html @@ -2,11 +2,11 @@ - + - + @@ -57,7 +57,7 @@ - + {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} @@ -101,7 +101,7 @@ - + diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html index 38ded23d6..3b97f1c3c 100644 --- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html +++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html @@ -39,7 +39,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -47,7 +47,7 @@ - + {{ 'core.h5p.offlinedisabled' | translate }} {{ 'addon.mod_h5pactivity.offlinedisabledwarning' | translate }} @@ -57,7 +57,7 @@ - + {{ 'addon.mod_h5pactivity.previewmode' | translate }} diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html index c2c672783..20de5c854 100644 --- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html +++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html @@ -63,11 +63,11 @@

{{ 'addon.mod_h5pactivity.outcome' | translate }}

- + {{ 'addon.mod_h5pactivity.attempt_success_pass' | translate }}

- + {{ 'addon.mod_h5pactivity.attempt_success_fail' | translate }}

@@ -152,7 +152,7 @@ - + {{ 'addon.mod_h5pactivity.no_compatible_track' | translate:{$a: result.interactiontype} }} diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html index ffefed01e..60362e216 100644 --- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html +++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html @@ -1,7 +1,7 @@ - - + + - - + + + +

diff --git a/src/addons/mod/imscp/components/toc/toc.html b/src/addons/mod/imscp/components/toc/toc.html index 26cf6605e..2931c1b00 100644 --- a/src/addons/mod/imscp/components/toc/toc.html +++ b/src/addons/mod/imscp/components/toc/toc.html @@ -3,7 +3,7 @@ {{ 'addon.mod_imscp.toc' | translate }} - + diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html index b6d7fc159..933227f81 100644 --- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html +++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -64,7 +64,7 @@ {{ 'addon.mod_lesson.continue' | translate }} - + @@ -114,7 +114,7 @@ {{ 'addon.mod_lesson.continue' | translate }} - + @@ -129,19 +129,19 @@ {{ 'core.start' | translate }} - + {{ 'addon.mod_lesson.preview' | translate }} - + {{ 'addon.mod_lesson.continue' | translate }} - + diff --git a/src/addons/mod/lesson/components/menu-modal/menu-modal.html b/src/addons/mod/lesson/components/menu-modal/menu-modal.html index 602349fd7..bf7492b03 100644 --- a/src/addons/mod/lesson/components/menu-modal/menu-modal.html +++ b/src/addons/mod/lesson/components/menu-modal/menu-modal.html @@ -4,7 +4,7 @@ - + diff --git a/src/addons/mod/lesson/components/password-modal/password-modal.html b/src/addons/mod/lesson/components/password-modal/password-modal.html index 37ddd3fad..052715488 100644 --- a/src/addons/mod/lesson/components/password-modal/password-modal.html +++ b/src/addons/mod/lesson/components/password-modal/password-modal.html @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ {{ 'addon.mod_lesson.continue' | translate }} - + diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html index a3f0bd5d7..b40786ff0 100644 --- a/src/addons/mod/lesson/pages/player/player.html +++ b/src/addons/mod/lesson/pages/player/player.html @@ -11,7 +11,7 @@ - + @@ -21,7 +21,7 @@ - + {{ messages[0].message }} @@ -172,7 +172,7 @@
- + {{ 'addon.mod_lesson.progressbarteacherwarning2' | translate }}
@@ -182,7 +182,7 @@
- + {{ 'addon.mod_lesson.finishretakeoffline' | translate }}
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html index 3302fe4ef..4a8188253 100644 --- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html +++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html @@ -24,7 +24,7 @@
- + {{ 'addon.mod_lti.launchactivity' | translate }}
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html index 3a99d22bb..49d132065 100644 --- a/src/addons/mod/page/components/index/addon-mod-page-index.html +++ b/src/addons/mod/page/components/index/addon-mod-page-index.html @@ -30,8 +30,10 @@ - - + + + +
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html index 18d2667bc..f2148d8f3 100644 --- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html +++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html @@ -164,7 +164,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -187,7 +187,7 @@ {{ 'core.openinbrowser' | translate }} - + diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html index 6b9e116af..773827622 100644 --- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html +++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ {{ 'core.question.information' | translate }} - + diff --git a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html index 959cf7d7e..68a418869 100644 --- a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html +++ b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html @@ -4,7 +4,7 @@ - + diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html index f34076199..58ad1ab4e 100644 --- a/src/addons/mod/quiz/pages/attempt/attempt.html +++ b/src/addons/mod/quiz/pages/attempt/attempt.html @@ -52,7 +52,7 @@ - + {{ 'addon.mod_quiz.review' | translate }} diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html index 9f266b669..61d60c803 100644 --- a/src/addons/mod/quiz/pages/player/player.html +++ b/src/addons/mod/quiz/pages/player/player.html @@ -11,12 +11,12 @@ - + [attr.aria-label]="'addon.mod_quiz.connectionerror' | translate" aria-haspopup="true"> + - + @@ -30,11 +30,11 @@ - - + + - - + + @@ -43,11 +43,12 @@ - - + + - - + + @@ -92,14 +93,14 @@ - + {{ 'core.previous' | translate }} {{ 'core.next' | translate }} - + @@ -165,7 +166,7 @@ {{ 'core.openinbrowser' | translate }} - + @@ -182,7 +183,7 @@ {{ 'core.openinbrowser' | translate }} - + diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html index 27140c18c..fdf75869f 100644 --- a/src/addons/mod/quiz/pages/review/review.html +++ b/src/addons/mod/quiz/pages/review/review.html @@ -7,8 +7,8 @@ - + (click)="openNavigation()" aria-haspopup="true"> + @@ -124,12 +124,13 @@ - + - - + + diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html index 9c5f81c23..a89d25990 100644 --- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html +++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@
- + {{ 'addon.mod_resource.openthefile' | translate }}
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html index 61d17c466..c35c961f5 100644 --- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html +++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html @@ -35,7 +35,7 @@ - + {{ scorm.warningMessage }} @@ -115,7 +115,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -182,7 +182,7 @@ {{ 'core.openinbrowser' | translate }} - + @@ -219,13 +219,13 @@ {{ 'addon.mod_scorm.browse' | translate }} - + {{ 'addon.mod_scorm.enter' | translate }} - + diff --git a/src/addons/mod/scorm/components/toc/toc.html b/src/addons/mod/scorm/components/toc/toc.html index ee5b3015e..9de84c25e 100644 --- a/src/addons/mod/scorm/components/toc/toc.html +++ b/src/addons/mod/scorm/components/toc/toc.html @@ -3,7 +3,7 @@ {{ 'addon.mod_scorm.toc' | translate }} - + diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html index f0d0c5ee0..acaf6d7f5 100644 --- a/src/addons/mod/scorm/pages/player/player.html +++ b/src/addons/mod/scorm/pages/player/player.html @@ -10,7 +10,7 @@ - + diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html index 0879ce799..3112a4e7d 100644 --- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html +++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html @@ -38,7 +38,7 @@

{{ 'addon.mod_survey.surveycompletednograph' | translate }}

- + {{ 'addon.mod_survey.results' | translate }}
@@ -46,7 +46,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html index 10bc4fbc2..fb8339bf3 100644 --- a/src/addons/mod/url/components/index/addon-mod-url-index.html +++ b/src/addons/mod/url/components/index/addon-mod-url-index.html @@ -44,7 +44,7 @@ - + {{ 'addon.mod_url.accessurl' | translate }} diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html index 3466dfb92..343dcdf04 100644 --- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html +++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html @@ -2,14 +2,14 @@ - - + [attr.aria-label]="'addon.mod_wiki.subwiki' | translate" aria-haspopup="true"> + + - + @@ -55,7 +55,7 @@ - + {{ 'core.hasdatatosync' | translate:{$a: pageStr} }} {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} @@ -66,7 +66,7 @@ - + {{ pageWarning }} @@ -90,6 +90,6 @@ - + diff --git a/src/addons/mod/wiki/components/map/map.html b/src/addons/mod/wiki/components/map/map.html index 56ad87d73..169e0ea38 100644 --- a/src/addons/mod/wiki/components/map/map.html +++ b/src/addons/mod/wiki/components/map/map.html @@ -3,7 +3,7 @@ {{ 'addon.mod_wiki.map' | translate }} - + @@ -13,7 +13,7 @@ - + {{ 'addon.mod_wiki.gowikihome' | translate }} @@ -22,14 +22,14 @@ - + - + {{ 'core.notsent' | translate }} diff --git a/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html b/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html index 41eb324b0..ec970f130 100644 --- a/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html +++ b/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html @@ -7,7 +7,7 @@ [attr.disabled]="!subwiki.canedit && subwiki.id <= 0 ? true : null" tappable [class.core-selected-item]="isSubwikiSelected(subwiki)" detail="false"> {{ subwiki.name }} - + diff --git a/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html b/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html index 6439a8eaa..1028b6bc9 100644 --- a/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html +++ b/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html @@ -21,7 +21,7 @@ - {{ 'core.notsent' | translate }} + {{ 'core.notsent' | translate }} diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html index 3f3526b13..c255abb6e 100644 --- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html +++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html @@ -37,15 +37,19 @@ phases[workshop!.phase].tasks.length"> - - - - + + + +

{{task.title}}

- +
@@ -53,7 +57,7 @@ - + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} @@ -145,11 +149,11 @@ - + {{ 'addon.mod_workshop.createsubmission' | translate }} - + {{ 'addon.mod_workshop.editsubmission' | translate }} @@ -233,14 +237,14 @@ - + {{ 'core.previous' | translate }} {{ 'core.next' | translate }} - + diff --git a/src/addons/mod/workshop/components/phase/phase.html b/src/addons/mod/workshop/components/phase/phase.html index d9185830b..a505159ab 100644 --- a/src/addons/mod/workshop/components/phase/phase.html +++ b/src/addons/mod/workshop/components/phase/phase.html @@ -6,7 +6,7 @@ {{ 'addon.mod_workshop.userplan' | translate }} - + @@ -23,25 +23,29 @@ - +

{{ 'addon.mod_workshop.switchphase' + phase.code | translate }}

- +
- - - - - + + + +

{{task.title}}

- +
diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html index fafe401f3..baf4b89ec 100644 --- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html +++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html @@ -22,15 +22,15 @@

- {{ 'core.notsent' | translate }} + {{ 'core.notsent' | translate }} {{submission.timemodified | coreDateDayOrTime}} - {{ 'core.notsent' | translate }} + {{ 'core.notsent' | translate }} - {{ 'core.deletedoffline' | translate }} + {{ 'core.deletedoffline' | translate }}
@@ -59,7 +59,7 @@ {{ 'core.showmore' | translate }} - + @@ -101,8 +101,10 @@ {{submission.timemodified | coreDateDayOrTime}} -
{{ 'core.notsent' | translate }}
-
{{ 'core.deletedoffline' | translate }}
+
{{ 'core.notsent' | translate }}
+
+ {{ 'core.deletedoffline' | translate }} +
diff --git a/src/addons/mod/workshop/lang.json b/src/addons/mod/workshop/lang.json index 3b8f78e33..c58d6a45b 100644 --- a/src/addons/mod/workshop/lang.json +++ b/src/addons/mod/workshop/lang.json @@ -51,6 +51,10 @@ "switchphase30": "Switch to the assessment phase", "switchphase40": "Switch to the evaluation phase", "switchphase50": "Close workshop", + "taskdone": "Task done", + "taskfail": "Task fail", + "taskinfo": "Task info", + "tasktodo": "Task to do", "userplan": "Workshop planner", "userplancurrentphase": "Current phase", "warningassessmentmodified": "The submission was modified on the site.", diff --git a/src/addons/mod/workshop/pages/submission/submission.html b/src/addons/mod/workshop/pages/submission/submission.html index 07115d353..e04214159 100644 --- a/src/addons/mod/workshop/pages/submission/submission.html +++ b/src/addons/mod/workshop/pages/submission/submission.html @@ -31,16 +31,16 @@ - + {{ 'addon.mod_workshop.editsubmission' | translate }} - + {{ 'addon.mod_workshop.deletesubmission' | translate }} - + {{ 'core.restore' | translate }} diff --git a/src/addons/notes/components/add/add-modal.html b/src/addons/notes/components/add/add-modal.html index c4d1e5765..e0d6868d6 100644 --- a/src/addons/notes/components/add/add-modal.html +++ b/src/addons/notes/components/add/add-modal.html @@ -3,7 +3,7 @@ {{ 'addon.notes.addnewnote' | translate }} - + diff --git a/src/addons/notes/pages/list/list.html b/src/addons/notes/pages/list/list.html index f468c7df1..2800dea47 100644 --- a/src/addons/notes/pages/list/list.html +++ b/src/addons/notes/pages/list/list.html @@ -11,8 +11,8 @@ - + [attr.aria-label]="'core.toggledelete' | translate"> + - + {{ 'core.thereisdatatosync' | translate:{$a: 'addon.notes.notes' | translate | lowercase } }} @@ -66,23 +66,23 @@

- + {{ 'core.notsent' | translate }}

- + {{ 'core.deletedoffline' | translate }}

- + - +
@@ -94,7 +94,7 @@ - + diff --git a/src/addons/notifications/components/actions/addon-notifications-actions.html b/src/addons/notifications/components/actions/addon-notifications-actions.html index 1bb8682ca..348a2d701 100644 --- a/src/addons/notifications/components/actions/addon-notifications-actions.html +++ b/src/addons/notifications/components/actions/addon-notifications-actions.html @@ -1,7 +1,7 @@ - + {{ action.message | translate }} diff --git a/src/addons/notifications/lang.json b/src/addons/notifications/lang.json index 3844a5525..b3c02b52e 100644 --- a/src/addons/notifications/lang.json +++ b/src/addons/notifications/lang.json @@ -4,5 +4,6 @@ "notificationpreferences": "Notification preferences", "notifications": "Notifications", "playsound": "Play sound", - "therearentnotificationsyet": "There are no notifications." -} \ No newline at end of file + "therearentnotificationsyet": "There are no notifications.", + "unreadnotification": "Unread notification: {{$a}}" +} diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html index 00ab6367e..7eab388e4 100644 --- a/src/addons/notifications/pages/list/list.html +++ b/src/addons/notifications/pages/list/list.html @@ -14,7 +14,7 @@
- + {{ 'addon.notifications.markallread' | translate }} @@ -23,7 +23,11 @@
- + @@ -38,8 +42,7 @@ {{ notification.timecreated | coreDateDayOrTime }} - - + diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html index cfc90fcd6..8d136e900 100644 --- a/src/addons/privatefiles/pages/index/index.html +++ b/src/addons/privatefiles/pages/index/index.html @@ -49,7 +49,7 @@ - + diff --git a/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html b/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html index 1b3c7ad50..a05a766cd 100644 --- a/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html +++ b/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html @@ -6,7 +6,7 @@ - + {{ 'core.question.howtodraganddrop' | translate }} diff --git a/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html b/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html index eec783f34..cb66752d6 100644 --- a/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html +++ b/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html @@ -6,7 +6,7 @@ - + {{ 'core.question.howtodraganddrop' | translate }} diff --git a/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html b/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html index 113ff3572..3e3feddae 100644 --- a/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html +++ b/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html @@ -6,7 +6,7 @@ - + {{ 'core.question.howtodraganddrop' | translate }} diff --git a/src/addons/qtype/match/component/addon-qtype-match.html b/src/addons/qtype/match/component/addon-qtype-match.html index 495d0ea09..2c896e133 100644 --- a/src/addons/qtype/match/component/addon-qtype-match.html +++ b/src/addons/qtype/match/component/addon-qtype-match.html @@ -23,7 +23,9 @@ {{option.label}} - - + + diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html index 0abd17a77..5c97e12fc 100644 --- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html +++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html @@ -27,8 +27,10 @@ [color]='(option.isCorrect === 1 ? "success": "") + (option.isCorrect === 0 ? "danger": "")'> - - + + @@ -53,8 +55,10 @@ [color]='(option.isCorrect === 1 ? "success": "") + (option.isCorrect === 0 ? "danger": "")'> - - + +
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html index da7458197..dc6499dfd 100644 --- a/src/addons/storagemanager/pages/course-storage/course-storage.html +++ b/src/addons/storagemanager/pages/course-storage/course-storage.html @@ -14,7 +14,7 @@ {{ course.fullname }}

{{ 'addon.storagemanager.info' | translate }}

- +

{{ 'addon.storagemanager.storageused' | translate }}

@@ -45,7 +45,7 @@ -

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts index b71582d05..b25ec4e4b 100644 --- a/src/addons/storagemanager/pages/course-storage/course-storage.ts +++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts @@ -55,6 +55,8 @@ export class AddonStorageManagerCourseStoragePage implements OnInit { section.modules.forEach((module) => { module.parentSection = section; module.totalSize = 0; + module.modNameTranslated = CoreCourse.translateModuleName(module.modname) || ''; + // Note: This function only gets the size for modules which are downloadable. // For other modules it always returns 0, even if they have downloaded some files. // However there is no 100% reliable way to actually track the files in this case. @@ -225,4 +227,5 @@ type AddonStorageManagerCourseSection = Omit & { type AddonStorageManagerModule = CoreCourseModule & { parentSection?: AddonStorageManagerCourseSection; totalSize?: number; + modNameTranslated?: string; }; diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html index 11b8e47a0..c76e8c07f 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html @@ -13,7 +13,7 @@ {{ 'core.courses.courses' | translate }}

{{ 'addon.storagemanager.info' | translate }}

- +

{{ 'addon.storagemanager.storageused' | translate }}

{{ totalSize | coreBytesToSize }}

- + {{ 'core.fileuploader.addfiletext' | translate }} diff --git a/src/core/components/chart/core-chart.html b/src/core/components/chart/core-chart.html index 79c617a77..c0f03eb55 100644 --- a/src/core/components/chart/core-chart.html +++ b/src/core/components/chart/core-chart.html @@ -1,8 +1,8 @@ - + - + {{data.text}} diff --git a/src/core/components/context-menu/core-context-menu.html b/src/core/components/context-menu/core-context-menu.html index adac51104..00f169708 100644 --- a/src/core/components/context-menu/core-context-menu.html +++ b/src/core/components/context-menu/core-context-menu.html @@ -1,6 +1,6 @@ - + diff --git a/src/core/components/download-refresh/core-download-refresh.html b/src/core/components/download-refresh/core-download-refresh.html index 4c9c00db2..b199a90f0 100644 --- a/src/core/components/download-refresh/core-download-refresh.html +++ b/src/core/components/download-refresh/core-download-refresh.html @@ -2,14 +2,14 @@ - + - + diff --git a/src/core/components/empty-box/core-empty-box.html b/src/core/components/empty-box/core-empty-box.html index b15958be0..2cb3e0a68 100644 --- a/src/core/components/empty-box/core-empty-box.html +++ b/src/core/components/empty-box/core-empty-box.html @@ -1,7 +1,7 @@
- - + +

{{ message }}

diff --git a/src/core/components/file/core-file.html b/src/core/components/file/core-file.html index 71d1798c4..4b0dd5522 100644 --- a/src/core/components/file/core-file.html +++ b/src/core/components/file/core-file.html @@ -14,7 +14,7 @@ - +
diff --git a/src/core/components/local-file/core-local-file.html b/src/core/components/local-file/core-local-file.html index 510727bba..d357bb032 100644 --- a/src/core/components/local-file/core-local-file.html +++ b/src/core/components/local-file/core-local-file.html @@ -20,15 +20,15 @@
- + - + - +
diff --git a/src/core/components/mark-required/core-mark-required.html b/src/core/components/mark-required/core-mark-required.html index bf5cd4897..f45d161e8 100644 --- a/src/core/components/mark-required/core-mark-required.html +++ b/src/core/components/mark-required/core-mark-required.html @@ -1,3 +1,4 @@ - + diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts index 7bac66635..cb4534642 100644 --- a/src/core/components/navbar-buttons/navbar-buttons.ts +++ b/src/core/components/navbar-buttons/navbar-buttons.ts @@ -36,7 +36,7 @@ const BUTTON_HIDDEN_CLASS = 'core-navbar-button-hidden'; * * * - * + * * * */ diff --git a/src/core/components/navigation-bar/core-navigation-bar.html b/src/core/components/navigation-bar/core-navigation-bar.html index 3fdb8a357..4e5528ec7 100644 --- a/src/core/components/navigation-bar/core-navigation-bar.html +++ b/src/core/components/navigation-bar/core-navigation-bar.html @@ -3,22 +3,24 @@ - + + [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true"> + - - + + - - + [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true"> + + diff --git a/src/core/components/recaptcha/core-recaptcha-modal.html b/src/core/components/recaptcha/core-recaptcha-modal.html index 604fefa7c..74296c2a2 100644 --- a/src/core/components/recaptcha/core-recaptcha-modal.html +++ b/src/core/components/recaptcha/core-recaptcha-modal.html @@ -4,7 +4,7 @@ - + diff --git a/src/core/components/send-message-form/core-send-message-form.html b/src/core/components/send-message-form/core-send-message-form.html index 75d27f779..605851cf5 100644 --- a/src/core/components/send-message-form/core-send-message-form.html +++ b/src/core/components/send-message-form/core-send-message-form.html @@ -6,7 +6,7 @@ - + diff --git a/src/core/components/show-password/core-show-password.html b/src/core/components/show-password/core-show-password.html index 2aed670d7..b33aefbdd 100644 --- a/src/core/components/show-password/core-show-password.html +++ b/src/core/components/show-password/core-show-password.html @@ -1,4 +1,4 @@ - + diff --git a/src/core/components/tabs-outlet/core-tabs-outlet.html b/src/core/components/tabs-outlet/core-tabs-outlet.html index 58c5efbeb..e20d9a1ea 100644 --- a/src/core/components/tabs-outlet/core-tabs-outlet.html +++ b/src/core/components/tabs-outlet/core-tabs-outlet.html @@ -3,7 +3,7 @@ - + - - - {{ tab.title | translate}} + class="{{tab.class}}" [attr.aria-label]="tab.title | translate"> + + {{ tab.badge }} @@ -24,7 +23,7 @@ - + diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html index 033c12d41..fbba11446 100644 --- a/src/core/components/tabs/core-tabs.html +++ b/src/core/components/tabs/core-tabs.html @@ -2,24 +2,25 @@ - + - - - {{ tab.title | translate}} + + + {{ tab.badge }} - + diff --git a/src/core/components/timer/core-timer.html b/src/core/components/timer/core-timer.html index d2bf2181f..98212c438 100644 --- a/src/core/components/timer/core-timer.html +++ b/src/core/components/timer/core-timer.html @@ -1,6 +1,6 @@ - + {{ timerText }} {{ timeLeft | coreSecondsToHMS }} diff --git a/src/core/features/block/components/only-title-block/core-block-only-title.html b/src/core/features/block/components/only-title-block/core-block-only-title.html index c919a85a1..1579508db 100644 --- a/src/core/features/block/components/only-title-block/core-block-only-title.html +++ b/src/core/features/block/components/only-title-block/core-block-only-title.html @@ -1,4 +1,4 @@

{{ title | translate }}

- +
diff --git a/src/core/features/comments/components/add/add.html b/src/core/features/comments/components/add/add.html index 3afd70a3a..8d163f380 100644 --- a/src/core/features/comments/components/add/add.html +++ b/src/core/features/comments/components/add/add.html @@ -3,7 +3,7 @@ {{ 'core.comments.addcomment' | translate }} - + diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html index e2700aaf3..e53d03497 100644 --- a/src/core/features/comments/pages/viewer/viewer.html +++ b/src/core/features/comments/pages/viewer/viewer.html @@ -9,8 +9,8 @@ - + [attr.aria-label]="'core.toggledelete' | translate"> + - + {{ 'core.thereisdatatosync' | translate:{$a: 'core.comments.comments' | translate | lowercase } }} @@ -49,12 +49,12 @@

{{ offlineComment.fullname }}

- {{ 'core.notsent' | translate }} + {{ 'core.notsent' | translate }}

- +
@@ -73,7 +73,7 @@

{{ comment.fullname }}

{{ comment.timecreated * 1000 | coreFormatDate: 'strftimerecentfull' }}

- + {{ 'core.deletedoffline' | translate }}

@@ -81,11 +81,11 @@ - + - +
@@ -102,7 +102,7 @@ - + diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html index 9e59df15f..344438813 100644 --- a/src/core/features/course/components/format/core-course-format.html +++ b/src/core/features/course/components/format/core-course-format.html @@ -97,14 +97,14 @@ - + [attr.aria-label]="'core.previous' | translate"> + - - + + diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html index cf25c9990..17eab3cc1 100644 --- a/src/core/features/course/components/module/core-course-module.html +++ b/src/core/features/course/components/module/core-course-module.html @@ -5,7 +5,7 @@ 'core-not-clickable': !module.handlerData.action || module.uservisible === false}"> + class="core-module-icon">
@@ -32,7 +32,7 @@ [hidden]="button.hidden || spinner || module.handlerData.spinner" class="core-animate-show-hide" (click)="buttonClicked($event, button)" [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}"> - +
diff --git a/src/core/features/course/components/section-selector/section-selector.html b/src/core/features/course/components/section-selector/section-selector.html index 43bff2a76..964ed6be8 100644 --- a/src/core/features/course/components/section-selector/section-selector.html +++ b/src/core/features/course/components/section-selector/section-selector.html @@ -3,7 +3,7 @@ {{ 'core.course.sections' | translate }} - + diff --git a/src/core/features/course/components/tag-area/core-course-tag-area.html b/src/core/features/course/components/tag-area/core-course-tag-area.html index d7863d9e8..4b5e0a751 100644 --- a/src/core/features/course/components/tag-area/core-course-tag-area.html +++ b/src/core/features/course/components/tag-area/core-course-tag-area.html @@ -1,7 +1,7 @@ - +

{{ item.courseName }}

{{ 'core.category' | translate }}: {{ item.categoryName }}

-
\ No newline at end of file +
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html index 2344ab316..d9d9a6b4e 100644 --- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html +++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html @@ -19,7 +19,7 @@

{{ 'core.course.useactivityonbrowser' | translate }}

{{ 'core.openinbrowser' | translate }} - +

-
\ No newline at end of file +
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html index c53eb740a..4941d216d 100644 --- a/src/core/features/course/pages/preview/preview.html +++ b/src/core/features/course/pages/preview/preview.html @@ -20,8 +20,8 @@
- + [detail]="!avoidOpenCourse && canAccessCourse"> +

@@ -105,21 +105,21 @@ + [name]="prefetchCourseData.icon" slot="start" aria-hidden="true"> + aria-hidden="true" role="status">

{{ 'core.course.downloadcourse' | translate }}

- +

{{ 'core.course.contents' | translate }}

- +

{{ 'core.openinbrowser' | translate }}

diff --git a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html index 95e5294e3..e1ff79574 100644 --- a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html +++ b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html @@ -1,26 +1,25 @@ - +

{{ prefetch.statusTranslatable | translate }}

- +

{{ 'addon.storagemanager.deletecourse' | translate }}

- +

{{ 'core.courses.hidecourse' | translate }}

- +

{{ 'core.courses.show' | translate }}

- +

{{ 'core.courses.addtofavourites' | translate }}

- +

{{ 'core.courses.removefromfavourites' | translate }}

- diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html index c226b41e0..b59b337e5 100644 --- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html +++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html @@ -49,7 +49,7 @@ - + diff --git a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html index 71888137f..74eea5067 100644 --- a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html +++ b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html @@ -4,7 +4,7 @@ - + diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html index ebd473071..1221825b0 100644 --- a/src/core/features/courses/pages/categories/categories.html +++ b/src/core/features/courses/pages/categories/categories.html @@ -15,7 +15,7 @@ - +

- +

diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html index b7daa49e9..e2dc1b171 100644 --- a/src/core/features/courses/pages/dashboard/dashboard.html +++ b/src/core/features/courses/pages/dashboard/dashboard.html @@ -1,6 +1,6 @@ - + - - + + - +
- + {{ infoMessage | translate }}
diff --git a/src/core/features/emulator/components/capture-media/capture-media.html b/src/core/features/emulator/components/capture-media/capture-media.html index ef7d7d167..95819fa7a 100644 --- a/src/core/features/emulator/components/capture-media/capture-media.html +++ b/src/core/features/emulator/components/capture-media/capture-media.html @@ -30,8 +30,8 @@ - - + + @@ -47,13 +47,13 @@ - - - - + + + + - + @@ -63,4 +63,3 @@ - diff --git a/src/core/features/grades/lang.json b/src/core/features/grades/lang.json index 79e5dbda0..2ec6b459d 100644 --- a/src/core/features/grades/lang.json +++ b/src/core/features/grades/lang.json @@ -1,14 +1,20 @@ { + "aggregatemean": "Mean of grades", + "aggregatesum": "Natural", "average": "Average", "badgrade": "Supplied grade is invalid", + "calculatedgrade": "Calculated grade", + "category": "Category", "contributiontocoursetotal": "Contribution to course total", "feedback": "Feedback", "grade": "Grade", "gradeitem": "Grade item", "grades": "Grades", "lettergrade": "Letter grade", + "manualitem": "Manual item", "nogradesreturned": "No grades returned", "nooutcome": "No outcome", + "outcome": "Outcome", "percentage": "Percentage", "range": "Range", "rank": "Rank", diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html index 2def799b5..05f84958b 100644 --- a/src/core/features/grades/pages/course/course.html +++ b/src/core/features/grades/pages/course/course.html @@ -48,8 +48,10 @@ [class.core-selected-item]="grades.isSelected(row)" [attr.colspan]="row.colspan" > - - + + + diff --git a/src/core/features/grades/pages/grade/grade.html b/src/core/features/grades/pages/grade/grade.html index 0e4cf40ad..16ec6ce0e 100644 --- a/src/core/features/grades/pages/grade/grade.html +++ b/src/core/features/grades/pages/grade/grade.html @@ -16,8 +16,9 @@ - - + +

@@ -25,8 +26,8 @@
- - + +

diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts index c04a9ca78..5f7b9078d 100644 --- a/src/core/features/grades/services/grades-helper.ts +++ b/src/core/features/grades/services/grades-helper.ts @@ -32,7 +32,7 @@ import { CoreUrlUtils } from '@services/utils/url'; import { CoreMenuItem, CoreUtils } from '@services/utils/utils'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreNavigator } from '@services/navigator'; -import { makeSingleton } from '@singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreError } from '@classes/errors/error'; /** @@ -571,27 +571,36 @@ export class CoreGradesHelperProvider { */ protected setRowIcon(row: T, text: string): T { text = text.replace('%2F', '/').replace('%2f', '/'); - if (text.indexOf('/agg_mean') > -1) { row.itemtype = 'agg_mean'; row.image = 'assets/img/grades/agg_mean.png'; + row.iconAlt = Translate.instant('core.grades.aggregatemean'); } else if (text.indexOf('/agg_sum') > -1) { row.itemtype = 'agg_sum'; row.image = 'assets/img/grades/agg_sum.png'; + row.iconAlt = Translate.instant('core.grades.aggregatesum'); } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) { row.itemtype = 'outcome'; row.icon = 'fas-chart-pie'; + row.iconAlt = Translate.instant('core.grades.outcome'); } else if (text.indexOf('i/folder') > -1 || text.indexOf('fa-folder') > -1) { row.itemtype = 'category'; row.icon = 'fas-cubes'; + row.iconAlt = Translate.instant('core.grades.category'); } else if (text.indexOf('/manual_item') > -1 || text.indexOf('fa-square-o') > -1) { row.itemtype = 'manual'; row.icon = 'far-square'; + row.iconAlt = Translate.instant('core.grades.manualitem'); + } else if (text.indexOf('/calc') > -1 || text.indexOf('fa-calculator') > -1) { + row.itemtype = 'calc'; + row.icon = 'fas-calculator'; + row.iconAlt = Translate.instant('core.grades.calculatedgrade'); } else if (text.indexOf('/mod/') > -1) { const module = text.match(/mod\/([^/]*)\//); if (typeof module?.[1] != 'undefined') { row.itemtype = 'mod'; row.itemmodule = module[1]; + row.iconAlt = CoreCourse.translateModuleName(row.itemmodule) || ''; row.image = CoreCourse.getModuleIconSrc( module[1], CoreDomUtils.convertToElement(text).querySelector('img')?.getAttribute('src') ?? undefined, @@ -601,14 +610,17 @@ export class CoreGradesHelperProvider { if (row.rowspan && row.rowspan > 1) { row.itemtype = 'category'; row.icon = 'fas-cubes'; + row.iconAlt = Translate.instant('core.grades.category'); } else if (text.indexOf('src=') > -1) { row.itemtype = 'unknown'; const src = text.match(/src="([^"]*)"/); row.image = src?.[1]; + row.iconAlt = Translate.instant('core.unknown'); } else if (text.indexOf(' -1) { row.itemtype = 'unknown'; const src = text.match(/ - - + +
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 c4784e891..e683a53c5 100644 --- a/src/core/features/login/components/site-help/site-help.html +++ b/src/core/features/login/components/site-help/site-help.html @@ -4,7 +4,7 @@ - + diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.html b/src/core/features/login/components/site-onboarding/site-onboarding.html index de3610db4..814b95221 100644 --- a/src/core/features/login/components/site-onboarding/site-onboarding.html +++ b/src/core/features/login/components/site-onboarding/site-onboarding.html @@ -46,9 +46,18 @@