From e8a73689ef98cb38063c06747e054ff5176bc951 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 3 May 2023 11:53:23 +0200 Subject: [PATCH 1/3] MOBILE-4288 core: Format group names Group names may contain other filters such as mathjax, so only filtering multilanguage is not enough. --- src/addons/calendar/pages/event/event.html | 5 +- src/addons/calendar/pages/event/event.ts | 24 +--------- src/addons/messages/services/messages.ts | 7 ++- .../index/addon-mod-assign-index.html | 3 +- .../addon-mod-assign-submission.html | 6 ++- .../components/submission/submission.ts | 4 +- .../submission-list/submission-list.html | 6 ++- .../mod/assign/services/handlers/prefetch.ts | 3 +- .../components/index/index.html | 3 +- .../mod/chat/pages/sessions/sessions.html | 3 +- .../mod/chat/pages/sessions/sessions.ts | 5 +- .../index/addon-mod-data-index.html | 3 +- src/addons/mod/data/pages/edit/edit.html | 3 +- src/addons/mod/data/pages/entry/entry.html | 3 +- .../mod/data/services/handlers/prefetch.ts | 3 +- .../index/addon-mod-feedback-index.html | 3 +- .../mod/feedback/pages/attempts/attempts.html | 3 +- .../mod/feedback/pages/attempts/attempts.ts | 5 +- .../pages/nonrespondents/nonrespondents.html | 3 +- .../pages/nonrespondents/nonrespondents.ts | 2 +- .../feedback/services/handlers/prefetch.ts | 3 +- .../mod/forum/components/index/index.html | 8 +++- .../mod/forum/components/post/post.html | 5 +- .../pages/new-discussion/new-discussion.html | 13 +++-- .../pages/new-discussion/new-discussion.ts | 9 ++-- .../index/addon-mod-lesson-index.html | 10 ++-- .../mod/lesson/components/index/index.ts | 11 +++-- src/addons/mod/wiki/components/index/index.ts | 4 +- .../addon-mod-wiki-subwiki-picker.html | 4 +- .../subwiki-picker/subwiki-picker.ts | 1 + .../index/addon-mod-workshop-index.html | 3 +- .../workshop/services/handlers/prefetch.ts | 3 +- .../group-selector/group-selector.html | 5 +- .../group-selector/group-selector.ts | 47 +------------------ src/core/directives/format-text.ts | 4 ++ .../user-profile-field/user-profile-field.ts | 4 +- src/core/services/groups.ts | 7 ++- src/core/services/lang.ts | 21 +-------- src/core/services/tests/lang.test.ts | 4 +- src/core/services/utils/dom.ts | 4 +- 40 files changed, 112 insertions(+), 155 deletions(-) diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html index 9657c471a..eb531e30d 100644 --- a/src/addons/calendar/pages/event/event.html +++ b/src/addons/calendar/pages/event/event.html @@ -86,7 +86,10 @@

{{ 'core.group' | translate}}

-

{{ groupName }}

+

+ + +

diff --git a/src/addons/calendar/pages/event/event.ts b/src/addons/calendar/pages/event/event.ts index 153c00c0b..59b6eb622 100644 --- a/src/addons/calendar/pages/event/event.ts +++ b/src/addons/calendar/pages/event/event.ts @@ -30,7 +30,6 @@ import { CoreTextUtils } from '@services/utils/text'; import { CoreSites } from '@services/sites'; import { CoreCourse } from '@features/course/services/course'; import { CoreTimeUtils } from '@services/utils/time'; -import { CoreGroups } from '@services/groups'; import { NgZone, Translate } from '@singletons'; import { Subscription } from 'rxjs'; import { CoreNavigator } from '@services/navigator'; @@ -42,7 +41,6 @@ import { AddonCalendarEventsSource } from '@addons/calendar/classes/events-sourc import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager'; import { CoreReminders, CoreRemindersService } from '@features/reminders/services/reminders'; import { CoreRemindersSetReminderMenuComponent } from '@features/reminders/components/set-reminder-menu/set-reminder-menu'; -import { CoreLang } from '@services/lang'; /** * Page that displays a single calendar event. @@ -261,7 +259,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy { // If it's a group event, get the name of the group. if (courseId && this.event.groupid) { - promises.push(this.loadGroupName(this.event, courseId)); + this.groupName = event.groupname; } if (this.event.iscategoryevent && this.event.category) { @@ -359,26 +357,6 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy { return deleted; } - /** - * Load group name. - * - * @param event Event. - * @param courseId Course ID. - * @returns Promise resolved when done. - */ - protected async loadGroupName(event: AddonCalendarEventToDisplay, courseId: number): Promise { - try { - const groups = await CoreGroups.getUserGroupsInCourse(courseId); - - const group = groups.find((group) => group.id == event.groupid); - this.groupName = group ? await CoreLang.filterMultilang(group.name) : ''; - - } catch { - // Error getting groups, just don't show the group name. - this.groupName = ''; - } - } - /** * Add a reminder for this event. */ diff --git a/src/addons/messages/services/messages.ts b/src/addons/messages/services/messages.ts index 5c4d88403..e6804e12b 100644 --- a/src/addons/messages/services/messages.ts +++ b/src/addons/messages/services/messages.ts @@ -33,7 +33,6 @@ import { CoreError } from '@classes/errors/error'; import { AddonMessagesSyncEvents, AddonMessagesSyncProvider } from './messages-sync'; import { CoreWSError } from '@classes/errors/wserror'; import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications'; -import { MultilangString } from '@services/lang'; const ROOT_CACHE_KEY = 'mmaMessages:'; @@ -2971,7 +2970,7 @@ export type AddonMessagesConversationMember = { conversations?: { // Conversations between users. id: number; // Conversations id. type: number; // Conversation type: private or public. - name: MultilangString; // Multilang compatible conversation name2. + name: string; // Multilang compatible conversation name2. timecreated: number; // The timecreated timestamp for the conversation. }[]; }; @@ -3496,7 +3495,7 @@ export type AddonMessagesGetUserContactsWSResponse = { conversations?: { // Conversations between users. id: number; // Conversations id. type: number; // Conversation type: private or public. - name: MultilangString; // Multilang compatible conversation name2. + name: string; // Multilang compatible conversation name2. timecreated: number; // The timecreated timestamp for the conversation. }[]; }[]; @@ -3536,7 +3535,7 @@ export type AddonMessagesGetContactRequestsWSResponse = { conversations?: { // Conversations between users. id: number; // Conversations id. type: number; // Conversation type: private or public. - name: MultilangString; // Multilang compatible conversation name2. + name: string; // Multilang compatible conversation name2. timecreated: number; // The timecreated timestamp for the conversation. }[]; }[]; 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 af21ab52d..e7e04b991 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 @@ -21,7 +21,8 @@ - + + 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 1aa153367..90b30bb60 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 @@ -421,8 +421,10 @@ -

- {{lastAttempt!.submissiongroupname}} +

+ +

- + @@ -36,7 +37,8 @@

- {{submission.groupname}} + + diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts index e4c389836..0cb4fc2f4 100644 --- a/src/addons/mod/assign/services/handlers/prefetch.ts +++ b/src/addons/mod/assign/services/handlers/prefetch.ts @@ -35,7 +35,6 @@ import { AddonModAssignSync, AddonModAssignSyncResult } from '../assign-sync'; import { CoreUser } from '@features/user/services/user'; import { CoreGradesHelper } from '@features/grades/services/grades-helper'; import { CoreCourses } from '@features/courses/services/courses'; -import { multilangString } from '@services/lang'; /** * Handler to prefetch assigns. @@ -356,7 +355,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref // Teacher, prefetch all submissions. if (!groupInfo.groups || groupInfo.groups.length == 0) { - groupInfo.groups = [{ id: 0, name: multilangString() }]; + groupInfo.groups = [{ id: 0, name: '' }]; } const promises = groupInfo.groups.map((group) => diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html index 79da43a01..635291768 100644 --- a/src/addons/mod/bigbluebuttonbn/components/index/index.html +++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html @@ -14,7 +14,8 @@ + [multipleGroupsMessage]="'addon.mod_bigbluebuttonbn.view_groups_selection_warning' | translate" [courseId]="module.course"> + diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html index 2bfe9775d..a4d654c5d 100644 --- a/src/addons/mod/chat/pages/sessions/sessions.html +++ b/src/addons/mod/chat/pages/sessions/sessions.html @@ -14,7 +14,8 @@ - + + {{ 'addon.mod_chat.showincompletesessions' | translate }} diff --git a/src/addons/mod/chat/pages/sessions/sessions.ts b/src/addons/mod/chat/pages/sessions/sessions.ts index 1742da8cf..9f78793fd 100644 --- a/src/addons/mod/chat/pages/sessions/sessions.ts +++ b/src/addons/mod/chat/pages/sessions/sessions.ts @@ -34,15 +34,16 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy { @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent; sessions!: CoreListItemsManager; + courseId?: number; constructor() { try { - const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId'); + this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId'); const chatId = CoreNavigator.getRequiredRouteNumberParam('chatId'); const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId'); const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource( AddonModChatSessionsSource, - [courseId, chatId, cmId], + [this.courseId, chatId, cmId], ); this.sessions = new CoreListItemsManager(source, AddonModChatSessionsPage); diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html index 121c8ca1a..f4c96dc7c 100644 --- a/src/addons/mod/data/components/index/addon-mod-data-index.html +++ b/src/addons/mod/data/components/index/addon-mod-data-index.html @@ -25,7 +25,8 @@ [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings" (completionChanged)="onCompletionChange()"> - + diff --git a/src/addons/mod/data/pages/edit/edit.html b/src/addons/mod/data/pages/edit/edit.html index 6cc1d7be4..5cede4d25 100644 --- a/src/addons/mod/data/pages/edit/edit.html +++ b/src/addons/mod/data/pages/edit/edit.html @@ -18,7 +18,8 @@ - +

diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html index a6d75f048..53a41d6b3 100644 --- a/src/addons/mod/data/pages/entry/entry.html +++ b/src/addons/mod/data/pages/entry/entry.html @@ -25,7 +25,8 @@ - +
diff --git a/src/addons/mod/data/services/handlers/prefetch.ts b/src/addons/mod/data/services/handlers/prefetch.ts index 88a68fa91..49a2027a8 100644 --- a/src/addons/mod/data/services/handlers/prefetch.ts +++ b/src/addons/mod/data/services/handlers/prefetch.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { multilangString } from '@services/lang'; import { Injectable } from '@angular/core'; import { CoreComments } from '@features/comments/services/comments'; import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler'; @@ -99,7 +98,7 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet const groupInfo = await CoreGroups.getActivityGroupInfo(module.id, false, undefined, options.siteId); if (!groupInfo.groups || groupInfo.groups.length == 0) { - groupInfo.groups = [{ id: 0, name: multilangString() }]; + groupInfo.groups = [{ id: 0, name: '' }]; } groups = groupInfo.groups || []; 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 aa89ab5ab..3396a80d2 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 @@ -60,7 +60,8 @@ - + + diff --git a/src/addons/mod/feedback/pages/attempts/attempts.html b/src/addons/mod/feedback/pages/attempts/attempts.html index 85b173371..0c97936e9 100644 --- a/src/addons/mod/feedback/pages/attempts/attempts.html +++ b/src/addons/mod/feedback/pages/attempts/attempts.html @@ -15,7 +15,8 @@ - + diff --git a/src/addons/mod/feedback/pages/attempts/attempts.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts index ecea1615d..3799bb66e 100644 --- a/src/addons/mod/feedback/pages/attempts/attempts.ts +++ b/src/addons/mod/feedback/pages/attempts/attempts.ts @@ -39,6 +39,7 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy { promisedAttempts: CorePromisedValue; fetchFailed = false; + courseId?: number; constructor(protected route: ActivatedRoute) { this.promisedAttempts = new CorePromisedValue(); @@ -86,11 +87,11 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy { */ async ngAfterViewInit(): Promise { try { + this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId'); const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId'); - const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId'); const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource( AddonModFeedbackAttemptsSource, - [courseId, cmId], + [this.courseId, cmId], ); source.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0; diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html index 57c33c2d9..fedb9bac9 100644 --- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html +++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html @@ -14,7 +14,8 @@ - + diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts index a192fc6b4..6917682ba 100644 --- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts +++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts @@ -31,10 +31,10 @@ import { AddonModFeedbackHelper, AddonModFeedbackNonRespondent } from '../../ser export class AddonModFeedbackNonRespondentsPage implements OnInit { protected cmId!: number; - protected courseId!: number; protected feedback?: AddonModFeedbackWSFeedback; protected page = 0; + courseId!: number; selectedGroup!: number; groupInfo?: CoreGroupInfo; users: AddonModFeedbackNonRespondent[] = []; diff --git a/src/addons/mod/feedback/services/handlers/prefetch.ts b/src/addons/mod/feedback/services/handlers/prefetch.ts index 1ed289302..058465519 100644 --- a/src/addons/mod/feedback/services/handlers/prefetch.ts +++ b/src/addons/mod/feedback/services/handlers/prefetch.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { multilangString } from '@services/lang'; import { Injectable } from '@angular/core'; import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler'; import { CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course'; @@ -188,7 +187,7 @@ export class AddonModFeedbackPrefetchHandlerService extends CoreCourseActivityPr const promises: Promise[] = []; if (!groupInfo.groups || groupInfo.groups.length == 0) { - groupInfo.groups = [{ id: 0, name: multilangString() }]; + groupInfo.groups = [{ id: 0, name: '' }]; } groupInfo.groups.forEach((group) => { diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html index 6339d32a9..d449f4cdd 100644 --- a/src/addons/mod/forum/components/index/index.html +++ b/src/addons/mod/forum/components/index/index.html @@ -25,7 +25,8 @@ - + @@ -95,7 +96,10 @@ {{discussion.userfullname}}

- {{ discussion.groupname }} + + +

{{discussion.created * 1000 | coreFormatDate: "strftimerecentfull"}} diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html index 9727242ba..8536431c5 100644 --- a/src/addons/mod/forum/components/post/post.html +++ b/src/addons/mod/forum/components/post/post.html @@ -34,7 +34,10 @@

- {{ group.name }} + + +

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

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 1fef00569..eec395e24 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html @@ -50,7 +50,10 @@ - {{ group.name }} + + + @@ -66,9 +69,13 @@ [allowOffline]="true" [courseId]="courseId">
- + - {{ 'addon.mod_forum.postingroup' | translate:{groupname: groupName} }} + + + + diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts index 86be911f7..cdb7772e9 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts @@ -44,7 +44,6 @@ import { AddonModForumDiscussionsSwipeManager } from '../../classes/forum-discus import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router'; import { AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source'; import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker'; -import { CoreLang, multilangString } from '@services/lang'; type NewDiscussionData = { subject: string; @@ -93,7 +92,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea advanced = false; // Display all form fields. accessInfo: AddonModForumAccessInformation = {}; courseId!: number; - groupName?: string; + postInGroupMessage?: string; discussions?: AddonModForumNewDiscussionDiscussionsSwipeManager; @@ -427,7 +426,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea groups.unshift({ courseid: this.courseId, id: AddonModForumProvider.ALL_PARTICIPANTS, - name: multilangString(Translate.instant('core.allparticipants')), + name: Translate.instant('core.allparticipants'), }); } @@ -614,11 +613,11 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea */ async calculateGroupName(): Promise { if (this.newDiscussion.groupId <= 0) { - this.groupName = undefined; + this.postInGroupMessage = undefined; } else { const groupName = this.groups.find(group => group.id === this.newDiscussion.groupId)?.name; - this.groupName = groupName && await CoreLang.filterMultilang(groupName); + this.postInGroupMessage = groupName && Translate.instant('addon.mod_forum.postingroup', { groupname: groupName }); } } 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 b289d2d50..4b4a24ab7 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 @@ -56,14 +56,16 @@ - + - + + - diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts index 7d5eb0c88..7d89c2004 100644 --- a/src/addons/mod/lesson/components/index/index.ts +++ b/src/addons/mod/lesson/components/index/index.ts @@ -48,7 +48,7 @@ import { import { AddonModLessonModuleHandlerService } from '../../services/handlers/module'; import { CoreTime } from '@singletons/time'; import { CoreError } from '@classes/errors/error'; -import { CoreLang } from '@services/lang'; +import { Translate } from '@singletons'; /** * Component that displays a lesson entry page. @@ -79,7 +79,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo leftDuringTimed?: boolean; // Whether the user has started and left a retake. groupInfo?: CoreGroupInfo; // The group info. reportLoaded?: boolean; // Whether the report data has been loaded. - selectedGroupName?: string; // The name of the selected group. + selectedGroupEmptyMessage?: string; // The message to show if the selected group is empty. overview?: AttemptsOverview; // Reports overview data. finishedOffline?: boolean; // Whether a retake was finished in offline. avetimeReadable?: string; // Average time in a readable format. @@ -487,12 +487,15 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo } this.group = groupId; - this.selectedGroupName = ''; + this.selectedGroupEmptyMessage = ''; // Search the name of the group if it isn't all participants. if (groupId && this.groupInfo && this.groupInfo.groups) { const group = this.groupInfo.groups.find(group => groupId == group.id); - this.selectedGroupName = group ? await CoreLang.filterMultilang(group.name) : ''; + + this.selectedGroupEmptyMessage = group + ? Translate.instant('addon.mod_lesson.nolessonattemptsgroup', { $a: group.name }) + : ''; } // Get the overview of retakes for the group. diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts index 10d24a76e..38780e1bb 100644 --- a/src/addons/mod/wiki/components/index/index.ts +++ b/src/addons/mod/wiki/components/index/index.ts @@ -55,7 +55,6 @@ import { } from '../../services/wiki-sync'; import { AddonModWikiMapModalComponent, AddonModWikiMapModalReturn } from '../map/map'; import { AddonModWikiSubwikiPickerComponent } from '../subwiki-picker/subwiki-picker'; -import { CoreLang } from '@services/lang'; /** * Component that displays a wiki entry page. @@ -829,6 +828,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp const subwiki = await CoreDomUtils.openPopover({ component: AddonModWikiSubwikiPickerComponent, componentProps: { + courseId: this.courseId, subwikis: this.subwikiData.subwikis, currentSubwiki: this.currentSubwiki, }, @@ -902,7 +902,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp if (subwiki.groupid != 0 && userGroups.length > 0) { // Get groupLabel if it has groupId. const group = userGroups.find(group => group.id == subwiki.groupid); - groupLabel = group ? await CoreLang.filterMultilang(group.name) : ''; + groupLabel = group?.name ?? ''; } else { groupLabel = Translate.instant('addon.mod_wiki.notingroup'); } 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 866a50f80..8b49b73ef 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 @@ -2,7 +2,9 @@ -

{{ group.label }}

+ + - + + - - {{ option.text }} + + + diff --git a/src/core/components/group-selector/group-selector.ts b/src/core/components/group-selector/group-selector.ts index 74254c084..1bf08ac8e 100644 --- a/src/core/components/group-selector/group-selector.ts +++ b/src/core/components/group-selector/group-selector.ts @@ -18,12 +18,8 @@ import { Output, EventEmitter, ChangeDetectionStrategy, - OnChanges, - SimpleChanges, - ChangeDetectorRef, } from '@angular/core'; import { CoreGroupInfo } from '@services/groups'; -import { CoreLang } from '@services/lang'; /** * Component to display a group selector. @@ -33,51 +29,12 @@ import { CoreLang } from '@services/lang'; templateUrl: 'group-selector.html', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class CoreGroupSelectorComponent implements OnChanges { +export class CoreGroupSelectorComponent { @Input() groupInfo?: CoreGroupInfo; @Input() multipleGroupsMessage?: string; @Input() selected!: number; + @Input() courseId?: number; @Output() selectedChange = new EventEmitter(); - options: GroupOption[] = []; - - constructor(protected changeDetectorRef: ChangeDetectorRef) {} - - /** - * @inheritdoc - */ - async ngOnChanges(changes: SimpleChanges): Promise { - if ('groupInfo' in changes) { - this.options = await this.getOptions(); - - this.changeDetectorRef.markForCheck(); - } - } - - /** - * Get options array. - * - * @returns Options. - */ - protected async getOptions(): Promise { - const options = await Promise.all( - (this.groupInfo?.groups ?? []).map(async group => { - const text = await CoreLang.filterMultilang(group.name); - - return { value: group.id, text }; - }), - ); - - return options; - } - -} - -/** - * Group display info. - */ -interface GroupOption { - value: number; - text: string; } diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts index e2c48feab..05bf27fcf 100644 --- a/src/core/directives/format-text.ts +++ b/src/core/directives/format-text.ts @@ -414,6 +414,10 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncDirec this.contextInstanceId = site.getSiteHomeId(); } + if (this.contextLevel === 'course' && this.contextInstanceId === undefined && this.courseId !== undefined) { + this.contextInstanceId = this.courseId; + } + const filter = this.filter === undefined ? !!(this.contextLevel && this.contextInstanceId !== undefined) : CoreUtils.isTrueOrOne(this.filter); diff --git a/src/core/features/user/components/user-profile-field/user-profile-field.ts b/src/core/features/user/components/user-profile-field/user-profile-field.ts index 5f42f50d7..e33b57526 100644 --- a/src/core/features/user/components/user-profile-field/user-profile-field.ts +++ b/src/core/features/user/components/user-profile-field/user-profile-field.ts @@ -14,7 +14,7 @@ import { Component, Input, OnInit, Type } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { CoreLang, multilangString } from '@services/lang'; +import { CoreLang } from '@services/lang'; import { AuthEmailSignupProfileField } from '@features/login/services/login-helper'; import { CoreUserProfileField } from '@features/user/services/user'; import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate'; @@ -52,7 +52,7 @@ export class CoreUserProfileFieldComponent implements OnInit { this.componentClass = await CoreUserProfileFieldDelegate.getComponent(this.field, this.signup); if ('param1' in this.field && this.field.param1) { - this.field.param1 = await CoreLang.filterMultilang(multilangString(this.field.param1)); + this.field.param1 = await CoreLang.filterMultilang(this.field.param1); } this.data.field = this.field; diff --git a/src/core/services/groups.ts b/src/core/services/groups.ts index 825aa0732..e537c5012 100644 --- a/src/core/services/groups.ts +++ b/src/core/services/groups.ts @@ -20,7 +20,6 @@ import { CoreError } from '@classes/errors/error'; import { makeSingleton, Translate } from '@singletons'; import { CoreWSExternalWarning } from '@services/ws'; import { CoreCourses } from '@features/courses/services/courses'; -import { multilangString, MultilangString } from '@services/lang'; const ROOT_CACHE_KEY = 'mmGroups:'; @@ -175,7 +174,7 @@ export class CoreGroupsProvider { groupInfo.defaultGroupId = 0; } else { if (result.canaccessallgroups || groupInfo.visibleGroups) { - groupInfo.groups.push({ id: 0, name: multilangString(Translate.instant('core.allparticipants')) }); + groupInfo.groups.push({ id: 0, name: Translate.instant('core.allparticipants') }); groupInfo.defaultGroupId = 0; } else { groupInfo.defaultGroupId = result.groups[0].id; @@ -443,7 +442,7 @@ export const CoreGroups = makeSingleton(CoreGroupsProvider); */ export type CoreGroup = { id: number; // Group ID. - name: MultilangString; // Multilang compatible name, course unique'. + name: string; // Multilang compatible name, course unique'. description?: string; // Group description text. descriptionformat?: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN). idnumber?: string; // Id number. @@ -527,7 +526,7 @@ type CoreGroupGetCourseUserGroupsWSParams = { export type CoreGroupGetCourseUserGroupsWSResponse = { groups: { id: number; // Group record id. - name: MultilangString; // Multilang compatible name, course unique. + name: string; // Multilang compatible name, course unique. description: string; // Group description text. descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN). idnumber: string; // Id number. diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts index 7af4b5e9b..e9b1dc3d5 100644 --- a/src/core/services/lang.ts +++ b/src/core/services/lang.ts @@ -26,7 +26,6 @@ import { CoreSite } from '../classes/site'; import { CorePlatform } from '@services/platform'; import { AddonFilterMultilangHandler } from '@addons/filter/multilang/services/handlers/multilang'; import { AddonFilterMultilang2Handler } from '@addons/filter/multilang2/services/handlers/multilang2'; -import { Brand } from '@/core/utils/types'; /* * Service to handle language features, like changing the current language. @@ -499,8 +498,8 @@ export class CoreLangProvider { * @param text Multilang string. * @returns Filtered string. */ - async filterMultilang(text: MultilangString): Promise { - return Promise.resolve(text as unknown as string) + async filterMultilang(text: string): Promise { + return Promise.resolve(text) .then(text => AddonFilterMultilangHandler.filter(text)) .then(text => AddonFilterMultilang2Handler.filter(text)); } @@ -569,27 +568,11 @@ export class CoreLangProvider { export const CoreLang = makeSingleton(CoreLangProvider); -/** - * Make a multilang string. - * - * @param text String. - * @returns Multilang string. - */ -export function multilangString(text: string = ''): MultilangString { - return text as unknown as MultilangString; -} - /** * Language code. E.g. 'au', 'es', etc. */ export type CoreLangLanguage = string; -/** - * Branded type to mark multilang strings, this is useful to avoid rendering - * multilang strings without filtering. - */ -export type MultilangString = Brand; - /** * Language object has two leves, first per language and second per string key. */ diff --git a/src/core/services/tests/lang.test.ts b/src/core/services/tests/lang.test.ts index 9df163e5f..574d93f0d 100644 --- a/src/core/services/tests/lang.test.ts +++ b/src/core/services/tests/lang.test.ts @@ -13,7 +13,7 @@ // limitations under the License. import { mockSingleton } from '@/testing/utils'; -import { CoreLang, CoreLangProvider, multilangString } from '@services/lang'; +import { CoreLang, CoreLangProvider } from '@services/lang'; describe('Lang', () => { @@ -126,7 +126,7 @@ describe('Lang', () => { * Test multilang filter (normalizing whitespace). */ async function expectMultilangFilter(text: string, expected: string): Promise { - const actual = await lang.filterMultilang(multilangString(text)); + const actual = await lang.filterMultilang(text); expect(actual.replace(/\s+/g, ' ').trim()).toEqual(expected); } diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index baa152a7a..83eb3c62c 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -58,7 +58,7 @@ import { CoreUserSupport } from '@features/user/services/support'; import { CoreErrorInfoComponent } from '@components/error-info/error-info'; import { CorePlatform } from '@services/platform'; import { CoreCancellablePromise } from '@classes/cancellable-promise'; -import { CoreLang, multilangString } from '@services/lang'; +import { CoreLang } from '@services/lang'; /* * "Utils" service with helper functions for UI, DOM elements and HTML code. @@ -1170,7 +1170,7 @@ export class CoreDomUtilsProvider { if (hasHTMLTags && !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.7')) { // Treat multilang. - options.message = await CoreLang.filterMultilang(multilangString( options.message)); + options.message = await CoreLang.filterMultilang( options.message); } const alertId = Md5.hashAsciiStr((options.header || '') + '#' + (options.message || '')); From 335a758350c33d1c57524e670cce0bb11ea3d29b Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 3 May 2023 11:53:45 +0200 Subject: [PATCH 2/3] MOBILE-4288 forum: Improve user groups UI --- .../mod/forum/components/index/index.html | 2 +- .../mod/forum/components/index/index.scss | 10 ++++++++++ .../mod/forum/components/post/post.html | 12 +++++++----- .../mod/forum/components/post/post.scss | 10 ++++++++++ ...-forum-activity-in-app-reply-a-post_14.png | Bin 22544 -> 22563 bytes ...f-forum-activity-in-app-reply-a-post_9.png | Bin 32401 -> 32756 bytes 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html index d449f4cdd..62bffc7ff 100644 --- a/src/addons/mod/forum/components/index/index.html +++ b/src/addons/mod/forum/components/index/index.html @@ -93,7 +93,7 @@ [linkProfile]="false">
- {{discussion.userfullname}} + {{discussion.userfullname}}

diff --git a/src/addons/mod/forum/components/index/index.scss b/src/addons/mod/forum/components/index/index.scss index 02e6267fd..c89233e8f 100644 --- a/src/addons/mod/forum/components/index/index.scss +++ b/src/addons/mod/forum/components/index/index.scss @@ -6,6 +6,16 @@ color: var(--core-star-color); } + .core-discussionusername { + font-size: 1.2em; + } + + .core-groupname { + display: flex; + align-items: center; + gap: 4px; + } + .addon-mod-forum-discussion.item { ion-label { margin-top: 4px; diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html index 8536431c5..3e3b2048f 100644 --- a/src/addons/mod/forum/components/post/post.html +++ b/src/addons/mod/forum/components/post/post.html @@ -30,16 +30,18 @@ [courseId]="courseId">

- {{post.author.fullname}} -

- + + {{ post.author.fullname }} + +

+

- -

+

+

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

{{ 'core.notsent' | translate }} diff --git a/src/addons/mod/forum/components/post/post.scss b/src/addons/mod/forum/components/post/post.scss index 1dcf74beb..b4a5b0092 100644 --- a/src/addons/mod/forum/components/post/post.scss +++ b/src/addons/mod/forum/components/post/post.scss @@ -8,6 +8,16 @@ color: var(--core-star-color); } + .core-discussionusername { + font-size: 1.2em; + } + + .core-groupname { + display: flex; + align-items: center; + gap: 4px; + } + ion-card-header .item { &.highlight::part(native) { diff --git a/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_14.png b/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_14.png index 1136339ecb4a06ca662b505a10ef420c19f21f0c..e498fdc6f2bb64d4c067e840b8b653ac0801d83a 100644 GIT binary patch delta 14284 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 diff --git a/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_9.png b/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_9.png index 8f64ca3b9585c7b5203a66a9f3db6985755d21d2..73d12cb730879dc5dc45923fa9724a30478e63e2 100644 GIT binary patch delta 15716 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 H`tyGQUzwe` delta 15358 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 Date: Wed, 3 May 2023 12:25:31 +0200 Subject: [PATCH 3/3] MOBILE-4288 multilang: Fix unknown language filter --- .../multilang/services/handlers/multilang.ts | 6 ++++++ src/core/services/tests/lang.test.ts | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/addons/filter/multilang/services/handlers/multilang.ts b/src/addons/filter/multilang/services/handlers/multilang.ts index 30685c130..af0014f74 100644 --- a/src/addons/filter/multilang/services/handlers/multilang.ts +++ b/src/addons/filter/multilang/services/handlers/multilang.ts @@ -47,10 +47,12 @@ export class AddonFilterMultilangHandlerService extends CoreFilterDefaultHandler // Get available languages. const regex = /<(?:lang|span)[^>]+lang="([a-zA-Z0-9_-]+)"[^>]*>.*?<\/(?:lang|span)>/img; const languages: Set = new Set(); + let firstLanguage: string | undefined; let match: RegExpExecArray | null; while ((match = regex.exec(text))) { const language = match[1].toLowerCase().replace(/_/g, '-'); + firstLanguage = firstLanguage ?? language; languages.add(language); } @@ -62,6 +64,10 @@ export class AddonFilterMultilangHandlerService extends CoreFilterDefaultHandler language = CoreLang.getParentLanguage(); } + if (!language) { + language = firstLanguage; + } + if (!language) { return text; } diff --git a/src/core/services/tests/lang.test.ts b/src/core/services/tests/lang.test.ts index 574d93f0d..c82e06ce5 100644 --- a/src/core/services/tests/lang.test.ts +++ b/src/core/services/tests/lang.test.ts @@ -122,6 +122,25 @@ describe('Lang', () => { `, 'Japanese text'); }); + it('filters multilang text using unknown language', async () => { + currentLanguage = 'ca'; + parentLanguage = undefined; + + await expectMultilangFilter(` + Spanish + English + Japanese + text + `, 'Spanish text'); + + await expectMultilangFilter(` + {mlang es}Spanish{mlang} + {mlang en}English{mlang} + {mlang ja}Japanese{mlang} + text + `, 'text'); + }); + /** * Test multilang filter (normalizing whitespace). */