Move strnigs to searchAndFilterStrings

learningequality · Jan 16, 2025 · 68422bf · 68422bf
1 parent e952876
commit 68422bf
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/...h/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/index.vue b/...h/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/index.vue
@@ -61,12 +61,12 @@
     </template>
 
     <KModal
-      v-if="isCloseConfirmationOpen"
+      v-if="isCloseConfirmationModalOpen"
       appendToOverlay
       :submitText="continueAction$()"
       :cancelText="cancelAction$()"
       :title="$tr('closeConfirmationTitle')"
-      @cancel="isCloseConfirmationOpen = false"
+      @cancel="isCloseConfirmationModalOpen = false"
       @submit="closeSidePanel(false)"
     >
       {{ $tr('closeConfirmationMessage') }}
@@ -145,7 +145,7 @@
         title: '',
         goBack: null,
         isSaving: false,
-        isCloseConfirmationOpen: false,
+        isCloseConfirmationModalOpen: false,
         PageNames,
       };
     },
@@ -224,7 +224,7 @@
         const newResources = this.getNewResources();
         const hasNewResources = newResources.length > this.workingResources.length;
         if (hasNewResources && verifyHasNewResources) {
-          this.isCloseConfirmationOpen = true;
+          this.isCloseConfirmationModalOpen = true;
         } else {
           this.$router.push({
             name: PageNames.LESSON_SUMMARY_BETTER,

diff --git a/...LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/ManageSelectedResources.vue b/...LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/ManageSelectedResources.vue
@@ -61,16 +61,16 @@
             <span class="row-actions">
               <KIconButton
                 icon="emptyTopic"
-                :ariaLabel="$tr('openParentFolderLabel')"
-                :tooltip="$tr('openParentFolderLabel')"
+                :ariaLabel="openParentFolderLabel$()"
+                :tooltip="openParentFolderLabel$()"
                 :disabled="disabled"
                 @click="navigateToParent(resource)"
               />
 
               <KIconButton
                 icon="minus"
-                :ariaLabel="$tr('removeResourceLabel')"
-                :tooltip="$tr('removeResourceLabel')"
+                :ariaLabel="removeResourceLabel$()"
+                :tooltip="removeResourceLabel$()"
                 :disabled="disabled"
                 @click="removeResource(resource)"
               />
@@ -80,7 +80,7 @@
       </transition-group>
     </DragContainer>
     <p v-else>
-      {{ $tr('emptyResourceList') }}
+      {{ emptyResourceList$() }}
     </p>
   </div>
 
@@ -114,7 +114,14 @@
     setup(props) {
       const prevRoute = ref(null);
 
-      const { upLabel$, downLabel$, numberOfSelectedResources$ } = searchAndFilterStrings;
+      const {
+        upLabel$,
+        downLabel$,
+        emptyResourceList$,
+        removeResourceLabel$,
+        openParentFolderLabel$,
+        numberOfSelectedResources$,
+      } = searchAndFilterStrings;
       const { lessonLabel$, sizeLabel$ } = coachStrings;
 
       const instance = getCurrentInstance();
@@ -148,6 +155,9 @@
         downLabel$,
         sizeLabel$,
         lessonLabel$,
+        emptyResourceList$,
+        removeResourceLabel$,
+        openParentFolderLabel$,
       };
     },
     props: {
@@ -203,20 +213,6 @@
         });
       },
     },
-    $trs: {
-      openParentFolderLabel: {
-        message: 'Open parent folder',
-        context: 'Button label to open the parent folder of a resource',
-      },
-      removeResourceLabel: {
-        message: 'Remove resource',
-        context: 'Button label to remove a resource from the selected resources',
-      },
-      emptyResourceList: {
-        message: 'No resources selected',
-        context: 'Message displayed when no resources are selected',
-      },
-    },
   };
 
 </script>

diff --git a/packages/kolibri-common/strings/searchAndFilterStrings.js b/packages/kolibri-common/strings/searchAndFilterStrings.js
@@ -44,4 +44,16 @@ export const searchAndFilterStrings = createTranslator('SearchAndFilterStrings',
       '{count, number, integer} {count, plural, one {resource selected} other {resources selected}}',
     context: 'Indicates the number of resources selected',
   },
+  openParentFolderLabel: {
+    message: 'Open parent folder',
+    context: 'Button label to open the parent folder of a resource',
+  },
+  removeResourceLabel: {
+    message: 'Remove resource',
+    context: 'Button label to remove a resource from the selected resources',
+  },
+  emptyResourceList: {
+    message: 'No resources selected',
+    context: 'Message displayed when no resources are selected',
+  },
 });