From 7807c8536c8ab7eec6075ca379d778642475e00a Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 18 Oct 2022 16:30:41 -0700
Subject: [PATCH] Fix i18n induced issues with learning activity icons.

---
 .../shared/views/ContentNodeLearningActivityIcon.vue       | 7 ++-----
 .../contentcuration/frontend/shared/vuetify/icons.js       | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/ContentNodeLearningActivityIcon.vue b/contentcuration/contentcuration/frontend/shared/views/ContentNodeLearningActivityIcon.vue
index 04d7f3e422..0248338ce4 100644
--- a/contentcuration/contentcuration/frontend/shared/views/ContentNodeLearningActivityIcon.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/ContentNodeLearningActivityIcon.vue
@@ -86,12 +86,10 @@
     },
     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));
@@ -99,7 +97,6 @@
     },
     $trs: {
       multipleLearningActivities: 'Multiple learning activities',
-      topic: 'Folder',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/shared/vuetify/icons.js b/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
index c6e22273a8..f02d90a78d 100644
--- a/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
+++ b/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
@@ -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'}`;