Merge pull request #8914 from marcellamaki/sidepanel-title-as-folder-…

…title Sidepanel title as folder title
learningequality · Dec 13, 2021 · ac0b0f5 · ac0b0f5
2 parents f8b6c5c + 5418600
commit ac0b0f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue b/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
@@ -69,7 +69,7 @@
     >
       <KIcon class="folder-icon" icon="topic" />
       <div class="next-label">
-        Next folder
+        {{ nextFolderMessage }}
       </div>
       <div class="next-title">
         {{ nextContent.title }}
@@ -163,6 +163,11 @@
       context() {
         return this.$route.query;
       },
+      nextFolderMessage() {
+        /* eslint-disable kolibri/vue-no-undefined-string-uses */
+        return sidePanelStrings.$tr('nextFolder');
+        /* eslint-enable */
+      },
     },
     methods: {
       genContentLink,

diff --git a/kolibri/plugins/learn/assets/src/views/LearnImmersiveLayout.vue b/kolibri/plugins/learn/assets/src/views/LearnImmersiveLayout.vue
@@ -116,7 +116,6 @@
   import LearningActivityBar from './LearningActivityBar';
   import AlsoInThis from './AlsoInThis';
 
-  const sidepanelStrings = crossComponentTranslator(FullScreenSidePanel);
   const lessonStrings = crossComponentTranslator(LessonResourceViewer);
 
   export default {
@@ -241,7 +240,7 @@
         /* eslint-disable kolibri/vue-no-undefined-string-uses */
         return this.lessonContext
           ? lessonStrings.$tr('nextInLesson')
-          : sidepanelStrings.$tr('topicHeader');
+          : this.content && this.content.ancestors.slice(-1)[0].title;
         /* eslint-enable */
       },
     },