Additional strings

kolibri/core/assets/src/mixins/commonCoreStrings.js

@@ -274,6 +274,10 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
     context:
       'This proper noun is the name of the learning platform, and is pronounced ko-lee-bree (/kolibɹi/). For languages with non-latin scripts, the word should be transcribed phonetically into the target language, similar to a person\'s name. It should not be translated as "hummingbird".',
   },
+  languageLabel: {
+    message: 'Language',
+    context: 'Refers to the language that is used in a resource or in Kolibri',
+  },
   learnerLabel: {
     message: 'Learner',
     context:
@@ -283,6 +287,10 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
     message: 'Learners',
     context: 'Plural of learner.',
   },
+  levelLabel: {
+    lessage: 'Level',
+    context: 'Filter label used to limit the search to a specific levels.',
+  },
   lessonsLabel: {
     message: 'Lessons',
     context:
@@ -298,7 +306,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
   },
   noUsersExistLabel: {
     message: 'No users exist',
-    context: 'Message used to indicate when there are no users in a class, for example.',
+    context: 'There are no users in this facility',
   },
   optionsLabel: {
     message: 'Options',
@@ -424,18 +432,43 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
       'Refers to the option to present the captions (subtitles) of the video in the form of the interactive transcript.',
   },
 
-  // Learning activities
-  allActivities: {
+  // Learning Activities
+  all: {
     message: 'All',
-    context: 'Refers to all types of learning activities.',
-  },
-  createActivity: 'Create',
-  listenActivity: 'Listen',
-  reflectActivity: 'Reflect',
-  practiceActivity: 'Practice',
-  readActivity: 'Read',
-  watchActivity: 'Watch',
-  exploreActivity: 'Explore',
+    context: 'A label for everything in the group of activities',
+  },
+  watch: {
+    message: 'Watch',
+    context:
+      'Resource and filter label for the type of learning activity with video. Translate as a VERB',
+  },
+  create: {
+    message: 'Create',
+    context: 'Resource and filter label for the type of learning activity. Translate as a VERB',
+  },
+  read: {
+    message: 'Read',
+    context:
+      'Resource and filter label for the type of learning activity with documents. Translate as a VERB',
+  },
+  practice: {
+    message: 'Practice',
+    context:
+      'Resource and filter label for the type of learning activity with questions and answers. Translate as a VERB',
+  },
+  reflect: {
+    message: 'Reflect',
+    context: 'Resource and filter label for the type of learning activity. Translate as a VERB',
+  },
+  listen: {
+    message: 'Listen',
+    context:
+      'Resource and filter label for the type of learning activity with audio. Translate as a VERB',
+  },
+  explore: {
+    message: 'Explore',
+    context: 'Resource and filter label for the type of learning activity. Translate as a VERB',
+  },
 
   // Library Categories
   school: 'School',
@@ -447,7 +480,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
   // School Categories
   mathematics: 'Mathematics',
   sciences: 'Sciences',
-  literature: 'Literature',
+  readingAndWriting: 'Reading and writing',
   socialSciences: 'Social sciences',
   arts: 'Arts',
   computerScience: 'Computer science',
@@ -469,6 +502,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
   astronomy: 'Astronomy',
 
   //  Literature Subcategories
+  literature: 'Literature',
   readingComprehension: 'Reading comprehension',
   writing: 'Writing',
   logicAndCriticalThinking: 'Logic and critical thinking',
@@ -494,15 +528,14 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
   literacy: 'Literacy',
   numeracy: 'Numeracy',
   digitialLiteracy: 'Digital literacy',
-  logicalAndCriticalThinking: 'Logic and critical thinking',
   learningSkills: 'Learning skills',
 
   // Work Categories
   professionalSkills: 'Professional skills',
   technicalAndVocationalTraining: 'Technical and vocational training',
 
   //  VocationalSubcategories
-  toolsAndSoftwareTraining: 'Tools and software training',
+  softwareToolsAndTraining: 'Software tools and training',
   skillsTraining: 'Skills training',
   industryAndSectorSpecific: 'Industry and sector specific',
 
@@ -534,9 +567,8 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
       'Allows the user to filter for all the resources with accessibility features for learners with disabilities.',
   },
   // Accessibility Categories
-  all: 'All',
   signLanguage: 'Has sign language captions',
-  audioDescription: 'Has audio description',
+  audioDescription: 'Has audio descriptions',
   taggedPdf: 'Tagged PDF',
   altText: 'Has alternative text description for images',
   highContrast: 'Has high contrast display for low vision',
@@ -554,7 +586,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
   allLevelsBasicSkills: 'All levels -- basic skills',
   allLevelsWorkSkills: 'All levels -- work skills',
 
-  browseChannel: 'Browse Channel',
+  browseChannel: 'Browse channel',
   topicLabel: 'Folder',
   readReference: {
     message: 'Reference',
@@ -572,6 +604,61 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
       'This is what we display as time estimation for some types of learning activities that take more than 30 minutes',
   },
 
+  // assigning bookmarked resources
+
+  availableClasses: {
+    message: 'Available classes',
+    context: 'Heading for the window where coaches make class selection.',
+  },
+
+  assignToClass: {
+    message: 'Assign this resource to which class?',
+    context: 'Message for coaches to select a class.',
+  },
+  assignToLesson: {
+    message: 'Assign this resource to which lesson?',
+    context: 'Message for coaches to select lessons',
+  },
+  lessonsInClass: {
+    message: 'Lessons in {class name}',
+    context: 'Heading for the window where coaches make lesson selections.',
+  },
+  addedToClassLesson: {
+    message: 'Added to class lesson',
+    context:
+      'Notification that a bookmarked resource has been added to a lesson in a selected class.',
+  },
+  selectFromBookmarks: {
+    message: 'Select from bookmarks',
+    context: "Option on the 'Manage lesson resources' page.",
+  },
+  savedFromBookmarks: {
+    message: 'Saved from bookmarks',
+    context:
+      'Notification message after user clicked the bookmark icon button, indicating the resource has been  saved.',
+  },
+  related: {
+    message: 'Related',
+    context: 'Section header for the list of resources that are related to the current resource',
+  },
+  doNotShowAgain: {
+    message: "Don't show this again",
+    context:
+      'Option that allows the user to prevent this resource from displaying in the future while using category search',
+  },
+  resourceHidden: {
+    message: 'Resource hidden',
+    context:
+      'Notification message indicating the resource has been marked as hidden for future category searches.',
+  },
+  allLevels: {
+    message: 'All levels',
+    context: 'Filter label to include resources for all available levels.',
+  },
+  showResources: {
+    message: 'Show resources',
+    context: '',
+  },
   // Notifications
   changesSavedNotification: {
     message: 'Changes saved',

kolibri/core/assets/src/views/UpdateNotification.vue

@@ -112,9 +112,9 @@
         message: 'We have released an important update with fixes to this version of Kolibri.',
         context: 'Notification indicating an important new version of Kolibri is available.',
       },
-      // TODO(i18n): Write a final version of this copy
       upgradeMessage_0_15_0: {
-        message: 'Kolibri version 0.15.0 is available! It has a lot of new features!',
+        message:
+          'Kolibri version 0.15.0 is available! It includes a redesigned home page for learners, support for learner data syncing, full support for H5P, and much more.',
         context: 'Notification indicating a new version of Kolibri is available.',
       },
       upgradeDownload: {

kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue

@@ -27,7 +27,7 @@
                 id="modal-title"
                 class="title"
               >
-                {{ $tr('resourceCompleted') }}
+                {{ learnString('resourceCompletedLabel') }}
               </h1>
             </KFixedGridItem>
             <KFixedGridItem
@@ -144,6 +144,7 @@
   import { validateLinkObject } from 'kolibri.utils.validators';
   import FocusTrap from 'kolibri.coreVue.components.FocusTrap';
   import PointsIcon from 'kolibri.coreVue.components.PointsIcon';
+  import commonLearnStrings from '../commonLearnStrings';
   import CompletionModalSection from './CompletionModalSection';
   import ResourceItem from './ResourceItem';
 
@@ -166,7 +167,7 @@
       ResourceItem,
       UiAlert,
     },
-    mixins: [KResponsiveWindowMixin],
+    mixins: [KResponsiveWindowMixin, commonLearnStrings],
     props: {
       /**
        * A sign-in prompt is displayed if a user
@@ -353,10 +354,6 @@
         context:
           'Message that a learner will see upon completing a resource if they are not signed in to Kolibri.',
       },
-      resourceCompleted: {
-        message: 'Resource completed',
-        context: 'Title of window which displays once a learner has completed a resource.',
-      },
       plusPoints: {
         message: '+ { points, number } points',
         context: 'Indicates the amount of points awarded to the learner for completing a resource.',

kolibri/plugins/learn/assets/src/views/EmbeddedSidePanel/SelectGroup.vue

@@ -5,13 +5,13 @@
       :options="languageOptionsList"
       class="selector"
       :value="selectedLanguage"
-      :label="$tr('language')"
+      :label="coreString('language')"
     />
     <KSelect
       :options="contentLevelsList"
       class="selector"
       :value="selectedLevel"
-      :label="$tr('level')"
+      :label="coreString('level')"
     />
     <KSelect
       v-if="channels"
@@ -24,7 +24,7 @@
       :options="accessibilityOptionsList"
       class="selector"
       :value="selectedAccessibilityFilter"
-      :label="$tr('accessibility')"
+      :label="coreString('accessibility')"
     />
   </div>
 
@@ -100,11 +100,6 @@
         return this.channelOptionsList.find(o => o.value === this.value) || {};
       },
     },
-    $trs: {
-      accessibility: 'Accessibility',
-      level: 'Level',
-      language: 'Language',
-    },
   };
 
 </script>

kolibri/plugins/learn/assets/src/views/LearnIndex.vue

@@ -396,7 +396,7 @@
     },
     $trs: {
       examReportTitle: {
-        message: '{examTitle} report',
+        message: 'Report for { examTitle }',
         context: 'Indicates the title of the quiz that the report corresponds to.',
       },
     },

kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue

@@ -197,7 +197,7 @@
             id: 'mark-complete',
             icon: 'star',
             iconColor: this.$themePalette.yellow.v_700,
-            label: this.$tr('markResourceAsFinished'),
+            label: this.learnString('markResourceAsCompleteLabel'),
             event: 'markComplete',
             dataTest: 'markCompleteButton',
           });
@@ -290,10 +290,6 @@
         message: 'View folder resources',
         context: 'Tooltip text.',
       },
-      markResourceAsFinished: {
-        message: 'Mark resource as completed',
-        context: 'Title for the confirmation window when marking a resource as completed.',
-      },
     },
   };
 

kolibri/plugins/learn/assets/src/views/LibraryPage.vue

@@ -197,7 +197,7 @@
       },
       /* eslint-disable kolibri/vue-no-unused-translations */
       results: {
-        message: '{results} results',
+        message: '{results, number, integer} {results, plural, one {result} other {results}}',
         context: 'Number of results for a given term after a Library search.',
       },
       moreThanXResults: {

kolibri/plugins/learn/assets/src/views/MarkAsCompleteModal.vue

@@ -1,7 +1,7 @@
 <template>
 
   <KModal
-    :title="$tr('markResourceAsCompleteLabel')"
+    :title="learnString('markResourceAsCompleteLabel')"
     :submitText="coreString('confirmAction')"
     :cancelText="coreString('cancelAction')"
     @submit="markResourceAsCompleted"
@@ -16,10 +16,11 @@
 <script>
 
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import commonLearnStrings from './commonLearnStrings';
 
   export default {
     name: 'MarkAsCompleteModal',
-    mixins: [commonCoreStrings],
+    mixins: [commonCoreStrings, commonLearnStrings],
     methods: {
       /*
        * Emits "complete" event on success.
@@ -30,27 +31,17 @@
           .dispatch('updateProgress', { progressPercent: 1 })
           .then(() => {
             this.$emit('complete');
-            this.$store.dispatch('createSnackbar', this.$tr('resourceCompletedSnackbar'));
+            this.$store.dispatch('createSnackbar', this.learnString('resourceCompletedLabel'));
           })
           .catch(e => this.$store.dispatch('handleApiError', e));
       },
     },
     $trs: {
-      markResourceAsCompleteLabel: {
-        message: 'Mark resource as complete',
-        context:
-          'Title of the modal window where a user will confirm or cancel marking a resource as complete manually',
-      },
       markResourceAsCompleteConfirmation: {
-        message: 'Are you sure you want to mark this resource as finished?',
+        message: 'Are you sure you want to mark this resource as completed?',
         context:
           "The text asking the user to confirm that they want to manually mark the resource as complete, regardless of whether they've hit the 'completion criteria'",
       },
-      resourceCompletedSnackbar: {
-        message: 'Resource completed',
-        context:
-          'When the user successfully marks a resource as complete, they will see a small snackbar pop up showing this message.',
-      },
     },
   };