Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix list views not switching language #3626

Merged
merged 2 commits into from
May 6, 2024
Merged

Fix list views not switching language #3626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cc40fc
FIX List Views Not Switching Language
reicda Apr 30, 2024
e349990
cr translation tags not specified
reicda May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .../pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ export class AgendaItemFilterService extends BaseMeetingFilterListService<ViewAg
label: `Status`,
property: `closed`,
options: [
{ label: this.translate.instant(`Open items`), condition: [false, null] },
{ label: this.translate.instant(`Closed items`), condition: true }
{ label: `Open items`, condition: [false, null] },
{ label: `Closed items`, condition: true }
]
},
this.tagFilterOptions,
Expand All @@ -68,13 +68,13 @@ export class AgendaItemFilterService extends BaseMeetingFilterListService<ViewAg
options: this.createVisibilityFilterOptions()
},
{
label: this.translate.instant(`Module`),
label: `Module`,
property: `getContentObjectCollection`,
options: [
{ label: this.translate.instant(`Topics`), condition: Topic.COLLECTION },
{ label: this.translate.instant(`Motions`), condition: Motion.COLLECTION },
{ label: this.translate.instant(`Motion blocks`), condition: MotionBlock.COLLECTION },
{ label: this.translate.instant(`Elections`), condition: Assignment.COLLECTION }
{ label: `Topics`, condition: Topic.COLLECTION },
{ label: `Motions`, condition: Motion.COLLECTION },
{ label: `Motion blocks`, condition: MotionBlock.COLLECTION },
{ label: `Elections`, condition: Assignment.COLLECTION }
]
}
];
Expand Down
60 changes: 30 additions & 30 deletions ...ages/participant-list/services/participant-list-filter/participant-list-filter.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,84 +70,84 @@ export class ParticipantListFilterService extends BaseMeetingFilterListService<V
property: `isPresentInMeeting`,
label: `Presence`,
options: [
{ condition: true, label: this.translate.instant(`Is present`) },
{ condition: [false, null], label: this.translate.instant(`Is not present`) }
{ condition: true, label: `Is present` },
{ condition: [false, null], label: `Is not present` }
]
},
{
property: `is_active`,
label: this.translate.instant(`Active`),
label: `Active`,
options: [
{ condition: true, label: this.translate.instant(`Is active`) },
{ condition: [false, null], label: this.translate.instant(`Is not active`) }
{ condition: true, label: `Is active` },
{ condition: [false, null], label: `Is not active` }
]
},
{
property: `is_physical_person`,
label: this.translate.instant(`Committee`),
label: `Committee`,
options: [
{ condition: true, label: this.translate.instant(`Is not a committee`) },
{ condition: [false, null], label: this.translate.instant(`Is a committee`) }
{ condition: true, label: `Is not a committee` },
{ condition: [false, null], label: `Is a committee` }
]
},
{
property: `isLastEmailSent`,
label: this.translate.instant(`Last email sent`),
label: `Last email sent`,
options: [
{ condition: true, label: this.translate.instant(`Got an email`) },
{ condition: [false, null], label: this.translate.instant(`Didn't get an email`) }
{ condition: true, label: `Got an email` },
{ condition: [false, null], label: `Didn't get an email` }
]
},
{
property: `isLastLogin`,
label: this.translate.instant(`Last login`),
label: `Last login`,
options: [
{ condition: true, label: this.translate.instant(`Has logged in`) },
{ condition: [false, null], label: this.translate.instant(`Has not logged in yet`) }
{ condition: true, label: `Has logged in` },
{ condition: [false, null], label: `Has not logged in yet` }
]
},
{
property: `isVoteWeightOne`,
label: this.translate.instant(`Vote weight`),
label: `Vote weight`,
options: [
{ condition: [false, null], label: this.translate.instant(`Has changed vote weight`) },
{ condition: true, label: this.translate.instant(`Has unchanged vote weight`) }
{ condition: [false, null], label: `Has changed vote weight` },
{ condition: true, label: `Has unchanged vote weight` }
]
},
{
property: `gender`,
label: this.translate.instant(`Gender`),
label: `Gender`,
options: [
{ condition: GENDER_FITLERABLE[0], label: this.translate.instant(GENDERS[0]) },
{ condition: GENDER_FITLERABLE[1], label: this.translate.instant(GENDERS[1]) },
{ condition: GENDER_FITLERABLE[2], label: this.translate.instant(GENDERS[2]) },
{ condition: GENDER_FITLERABLE[3], label: this.translate.instant(GENDERS[3]) },
{ condition: null, label: this.translate.instant(`not specified`) }
{ condition: GENDER_FITLERABLE[0], label: GENDERS[0] },
{ condition: GENDER_FITLERABLE[1], label: GENDERS[1] },
{ condition: GENDER_FITLERABLE[2], label: GENDERS[2] },
{ condition: GENDER_FITLERABLE[3], label: GENDERS[3] },
{ condition: null, label: `not specified` }
]
},
{
property: `hasSamlId`,
label: this.translate.instant(`SSO`),
label: `SSO`,
options: [
{ condition: true, label: this.translate.instant(`Has SSO identification`) },
{ condition: [false, null], label: this.translate.instant(`Has no SSO identification`) }
{ condition: true, label: `Has SSO identification` },
{ condition: [false, null], label: `Has no SSO identification` }
]
},
{
property: `delegationType`,
label: this.translate.instant(`Delegation of vote`),
label: `Delegation of vote`,
options: [
{
condition: DelegationType.Transferred,
label: this.translate.instant(`Voting right received from (principals)`)
label: `Voting right received from (principals)`
},
{
condition: DelegationType.Received,
label: this.translate.instant(`Voting right delegated to (proxy)`)
label: `Voting right delegated to (proxy)`
},
{
condition: DelegationType.Neither,
label: this.translate.instant(`No delegation of vote`)
label: `No delegation of vote`
}
]
}
Expand Down
42 changes: 21 additions & 21 deletions ...rvices/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,46 +46,46 @@ export class ParticipantSpeakerListFilterService extends BaseMeetingFilterListSe
const staticFilterOptions: OsFilter<ViewSpeaker>[] = [
{
property: `gender`,
label: this.translate.instant(`Gender`),
label: `Gender`,
options: [
{ condition: GENDER_FITLERABLE[0], label: this.translate.instant(GENDERS[0]) },
{ condition: GENDER_FITLERABLE[1], label: this.translate.instant(GENDERS[1]) },
{ condition: GENDER_FITLERABLE[2], label: this.translate.instant(GENDERS[2]) },
{ condition: GENDER_FITLERABLE[3], label: this.translate.instant(GENDERS[3]) },
{ condition: null, label: this.translate.instant(`not specified`) }
{ condition: GENDER_FITLERABLE[0], label: GENDERS[0] },
{ condition: GENDER_FITLERABLE[1], label: GENDERS[1] },
{ condition: GENDER_FITLERABLE[2], label: GENDERS[2] },
{ condition: GENDER_FITLERABLE[3], label: GENDERS[3] },
{ condition: null, label: `not specified` }
]
},
{
property: `speech_state`,
label: this.translate.instant(`Speech type`),
label: `Speech type`,
options: [
{ condition: SpeechState.PRO, label: this.translate.instant(`Forspeech`) },
{ condition: SpeechState.CONTRA, label: this.translate.instant(`Contra speech`) },
{ condition: SpeechState.CONTRIBUTION, label: this.translate.instant(`Contribution`) },
{ condition: SpeechState.INTERVENTION, label: this.translate.instant(`Intervention`) },
{ condition: SpeechState.PRO, label: `Forspeech` },
{ condition: SpeechState.CONTRA, label: `Contra speech` },
{ condition: SpeechState.CONTRIBUTION, label: `Contribution` },
{ condition: SpeechState.INTERVENTION, label: `Intervention` },
{
condition: SpeechState.INTERPOSED_QUESTION,
label: this.translate.instant(`Interposed question`)
label: `Interposed question`
},
{ condition: null, label: this.translate.instant(`not specified`) }
{ condition: null, label: `not specified` }
]
},
{
property: `contentType`,
label: this.translate.instant(`Module`),
label: `Module`,
options: [
{ condition: `topic`, label: this.translate.instant(`Agenda`) },
{ condition: `motion`, label: this.translate.instant(`Motions`) },
{ condition: `motion_block`, label: this.translate.instant(`Motion blocks`) },
{ condition: `assignment`, label: this.translate.instant(`Elections`) }
{ condition: `topic`, label: `Agenda` },
{ condition: `motion`, label: `Motions` },
{ condition: `motion_block`, label: `Motion blocks` },
{ condition: `assignment`, label: `Elections` }
]
},
{
property: `hasSpoken`,
label: this.translate.instant(`Speaker`),
label: `Speaker`,
options: [
{ condition: true, label: this.translate.instant(`Has spoken`) },
{ condition: [false, null], label: this.translate.instant(`Has not spoken`) }
{ condition: true, label: `Has spoken` },
{ condition: [false, null], label: `Has not spoken` }
]
}
];
Expand Down
Loading