Skip to content

Fix i18n induced issues with learning activity icons. #3749

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

Merged
bjester merged 1 commit into from
Oct 19, 2022
+4 −7
Merged

Fix i18n induced issues with learning activity icons. #3749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions contentcuration/contentcuration/frontend/shared/views/ContentNodeLearningActivityIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,17 @@
},
methods: {
icon(activity) {
return getLearningActivityIcon(this.text(activity));
return getLearningActivityIcon(activity);
},
text(activity) {
if (this.isTopic) {
return this.$tr('topic');
} else if (activity == 'multiple') {
if (activity === 'multiple') {
return this.$tr('multipleLearningActivities');
}
return this.translateMetadataString(camelCase(activity));
},
},
$trs: {
multipleLearningActivities: 'Multiple learning activities',
topic: 'Folder',
},
};

Expand Down
4 changes: 2 additions & 2 deletions contentcuration/contentcuration/frontend/shared/vuetify/icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export function getContentKindIcon(kind, isEmpty = false) {
}

export function getLearningActivityIcon(activity) {
if (activity == 'Explore') {
if (activity.toLowerCase() === 'explore') {
return 'interactShaded';
} else if (activity == 'Multiple learning activities') {
} else if (activity === 'multiple') {
return 'allActivities';
} else {
return `${camelCase(activity) + 'Solid'}`;
Expand Down