Move strings to searchAndFilterStrings and coachStrings

learningequality · Jan 16, 2025 · 58f9ff6 · 58f9ff6
1 parent e952876
commit 58f9ff6
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 65 deletions.
diff --git a/kolibri/plugins/coach/assets/src/views/common/commonCoachStrings.js b/kolibri/plugins/coach/assets/src/views/common/commonCoachStrings.js
@@ -373,6 +373,16 @@ const coachStrings = createTranslator('CommonCoachStrings', {
     message: 'Deleted',
     context: 'Generic notification.',
   },
+  closeConfirmationTitle: {
+    message: 'Are you sure you want to leave this page?',
+    context:
+      'The title of a confirmation modal informing the user that they will lose their work if they leave the page',
+  },
+  closeConfirmationMessage: {
+    message: 'You will lose any unsaved edits to your work',
+    context:
+      'Warning message for the user that they will lose their work if they leave the page without saving.',
+  },
 
   // errors
   saveLessonError: {

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,15 +61,15 @@
     </template>
 
     <KModal
-      v-if="isCloseConfirmationOpen"
+      v-if="isCloseConfirmationModalOpen"
       appendToOverlay
       :submitText="continueAction$()"
       :cancelText="cancelAction$()"
-      :title="$tr('closeConfirmationTitle')"
-      @cancel="isCloseConfirmationOpen = false"
+      :title="closeConfirmationTitle$()"
+      @cancel="isCloseConfirmationModalOpen = false"
       @submit="closeSidePanel(false)"
     >
-      {{ $tr('closeConfirmationMessage') }}
+      {{ closeConfirmationMessage$() }}
     </KModal>
   </SidePanelModal>
 
@@ -115,7 +115,7 @@
       function notifyResourcesAdded(count) {
         createSnackbar(resourcesAddedWithCount$({ count }));
       }
-      const { saveLessonError$ } = coachStrings;
+      const { saveLessonError$, closeConfirmationTitle$, closeConfirmationMessage$ } = coachStrings;
       function notifySaveLessonError() {
         createSnackbar(saveLessonError$());
       }
@@ -138,14 +138,16 @@
         cancelAction$,
         continueAction$,
         saveAndFinishAction$,
+        closeConfirmationTitle$,
+        closeConfirmationMessage$,
       };
     },
     data() {
       return {
         title: '',
         goBack: null,
         isSaving: false,
-        isCloseConfirmationOpen: false,
+        isCloseConfirmationModalOpen: false,
         PageNames,
       };
     },
@@ -224,7 +226,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,
@@ -238,18 +240,6 @@
         this.goBack = goBack;
       },
     },
-    $trs: {
-      closeConfirmationTitle: {
-        message: 'Are you sure you want to leave this page?',
-        context:
-          'The title of a confirmation modal informing the user that they will lose their work if they leave the page',
-      },
-      closeConfirmationMessage: {
-        message: 'You will lose any unsaved edits to your work',
-        context:
-          'Warning message for the user that they will lose their work if they leave the page without saving.',
-      },
-    },
   };
 
 </script>

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/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/ReplaceQuestions.vue
@@ -157,6 +157,7 @@
   import useAccordion from 'kolibri-common/components/useAccordion';
   import useSnackbar from 'kolibri/composables/useSnackbar';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
+  import { coachStrings } from '../../common/commonCoachStrings';
   import { PageNames } from '../../../constants/index';
 
   export default {
@@ -175,8 +176,6 @@
         replaceQuestions$,
         replaceAction$,
         selectAllLabel$,
-        closeConfirmationMessage$,
-        closeConfirmationTitle$,
         replaceQuestionsExplaination$,
         replaceQuestionsHeading$,
         numberOfSelectedReplacements$,
@@ -187,6 +186,8 @@
         expandAll$,
       } = enhancedQuizManagementStrings;
 
+      const { closeConfirmationTitle$, closeConfirmationMessage$ } = coachStrings;
+
       const {
         // Computed
         activeSection,

diff --git a/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/ResourceSelection.vue
@@ -215,6 +215,7 @@
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import useBaseSearch from 'kolibri-common/composables/useBaseSearch';
   import SearchFiltersPanel from 'kolibri-common/components/SearchFiltersPanel';
+  import { coachStrings } from '../../common/commonCoachStrings';
   import { exerciseToQuestionArray } from '../../../utils/selectQuestions';
   import { PageNames, ViewMoreButtonStates } from '../../../constants/index';
   import BookmarkIcon from '../../lessons/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue';
@@ -270,8 +271,6 @@
         selectResourcesDescription$,
         questionsFromResources$,
         cannotSelectSomeTopicWarning$,
-        closeConfirmationMessage$,
-        closeConfirmationTitle$,
         questionsUnusedInSection$,
         numberOfQuestionsSelected$,
         numberOfQuestionsToAdd$,
@@ -283,6 +282,8 @@
         addNumberOfQuestions$,
       } = enhancedQuizManagementStrings;
 
+      const { closeConfirmationTitle$, closeConfirmationMessage$ } = coachStrings;
+
       const { windowIsSmall } = useKResponsiveWindow();
 
       /**

diff --git a/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/SectionEditor.vue
@@ -136,6 +136,7 @@
   import { MAX_QUESTIONS_PER_QUIZ_SECTION } from 'kolibri/constants';
   import useSnackbar from 'kolibri/composables/useSnackbar';
   import { PageNames } from '../../../constants/index';
+  import { coachStrings } from '../../common/commonCoachStrings.js';
   import { injectQuizCreation } from '../../../composables/useQuizCreation.js';
 
   export default {
@@ -160,15 +161,15 @@
         randomizedOptionDescription$,
         fixedLabel$,
         fixedOptionDescription$,
-        closeConfirmationMessage$,
-        closeConfirmationTitle$,
         deleteConfirmation$,
         addQuestionsLabel$,
         addMoreQuestionsLabel$,
         sectionDeletedNotification$,
         maxNumberOfQuestions$,
       } = enhancedQuizManagementStrings;
 
+      const { closeConfirmationTitle$, closeConfirmationMessage$ } = coachStrings;
+
       const {
         activeSectionIndex,
         activeSection,

diff --git a/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/SectionOrder.vue b/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/SectionOrder.vue
@@ -99,6 +99,7 @@
   import DragSortWidget from 'kolibri-common/components/sortable/DragSortWidget';
   import { searchAndFilterStrings } from 'kolibri-common/strings/searchAndFilterStrings';
   import { PageNames } from '../../../constants/index';
+  import { coachStrings } from '../../common/commonCoachStrings.js';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
   import useDrag from './useDrag.js';
 
@@ -112,13 +113,9 @@
     },
     mixins: [commonCoreStrings],
     setup(_, context) {
-      const {
-        applySettings$,
-        sectionOrderLabel$,
-        currentSection$,
-        closeConfirmationMessage$,
-        closeConfirmationTitle$,
-      } = enhancedQuizManagementStrings;
+      const { applySettings$, sectionOrderLabel$, currentSection$ } = enhancedQuizManagementStrings;
+
+      const { closeConfirmationTitle$, closeConfirmationMessage$ } = coachStrings;
 
       const { activeSectionIndex, activeSection, allSections, updateQuiz } = injectQuizCreation();
 

diff --git a/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/index.vue b/kolibri/plugins/coach/assets/src/views/quizzes/CreateExamPage/index.vue
@@ -123,6 +123,7 @@
   import useSnackbar from 'kolibri/composables/useSnackbar';
   import { PageNames } from '../../../constants';
   import CoachImmersivePage from '../../CoachImmersivePage';
+  import { coachStrings } from '../../common/commonCoachStrings';
   import useQuizCreation from '../../../composables/useQuizCreation';
   import AssignmentDetailsModal from '../../common/assignments/AssignmentDetailsModal';
   import useCoreCoach from '../../../composables/useCoreCoach';
@@ -158,8 +159,6 @@
       const {
         saveAndClose$,
         allSectionsEmptyWarning$,
-        closeConfirmationTitle$,
-        closeConfirmationMessage$,
         changesSavedSuccessfully$,
         sectionOrderLabel$,
         randomizedLabel$,
@@ -168,6 +167,8 @@
         fixedSectionOptionDescription$,
       } = enhancedQuizManagementStrings;
 
+      const { closeConfirmationTitle$, closeConfirmationMessage$ } = coachStrings;
+
       return {
         closeConfirmationTitle$,
         closeConfirmationMessage$,

diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -141,17 +141,6 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     context:
       'A warning message that appears when the user tries to leave the page without saving their work',
   },
-  closeConfirmationTitle: {
-    message: 'Are you sure you want to leave this page?',
-    context:
-      'The title of a confirmation modal informing the user that they will lose their work if they leave the page',
-  },
-  closeConfirmationMessage: {
-    message: 'You will lose any unsaved edits to your work',
-    context:
-      'Warning message for the user that they will lose their work if they leave the page without saving.',
-  },
-
   numberOfSelectedReplacements: {
     message:
       '{ count, number } of { total, number } {total, plural, one {replacement selected} other {replacements selected}}',

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',
+  },
 });