Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional strings #8433

Merged
merged 7 commits into from
Sep 15, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 59 additions & 3 deletions kolibri/core/assets/src/mixins/commonCoreStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,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',
Expand All @@ -469,6 +469,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
astronomy: 'Astronomy',

// Literature Subcategories
literature: 'Literature',
readingComprehension: 'Reading comprehension',
writing: 'Writing',
logicAndCriticalThinking: 'Logic and critical thinking',
Expand Down Expand Up @@ -502,7 +503,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
technicalAndVocationalTraining: 'Technical and vocational training',

// VocationalSubcategories
toolsAndSoftwareTraining: 'Tools and software training',
softwareToolsAndTraining: 'Software tools and training',
skillsTraining: 'Skills training',
industryAndSectorSpecific: 'Industry and sector specific',

Expand Down Expand Up @@ -536,7 +537,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
// 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',
Expand Down Expand Up @@ -572,6 +573,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',
Expand Down
4 changes: 2 additions & 2 deletions kolibri/core/assets/src/views/UpdateNotification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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, data syncing, new quiz options, full support of H5P, and much more!',
context: 'Notification indicating a new version of Kolibri is available.',
},
upgradeDownload: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});
Expand Down Expand Up @@ -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.',
},
},
};

Expand Down
10 changes: 3 additions & 7 deletions kolibri/plugins/learn/assets/src/views/MarkAsCompleteModal.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>

<KModal
:title="$tr('markResourceAsCompleteLabel')"
:title="learnString('markResourceAsCompleteLabel')"
:submitText="coreString('confirmAction')"
:cancelText="coreString('cancelAction')"
@submit="markResourceAsCompleted"
Expand All @@ -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.
Expand All @@ -36,11 +37,6 @@
},
},
$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?',
context:
Expand Down
32 changes: 28 additions & 4 deletions kolibri/plugins/learn/assets/src/views/commonLearnStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ export const learnStrings = createTranslator('CommonLearnStrings', {
message: 'Next steps',
context: 'Label for links that go to post-requisites for content that has been completed.',
},
exploreResourcesWatch: {
message: 'Explore resources to watch',
multipleLearningActivitiesLabel: {
message: 'Multiple learning activities',
context: '',
},
exploreResourcesSchool: {
message: 'Explore resources for school',
exploreResources: {
message: 'Explore resources',
},
logo: {
message: 'From the channel {channelTitle}',
Expand Down Expand Up @@ -76,6 +77,29 @@ export const learnStrings = createTranslator('CommonLearnStrings', {
message: 'Explore',
context: 'Resource and filter label for the type of learning activity. Translate as a VERB',
},
dontShowThisAgainLabel: {
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',
},
markResourceAsCompleteLabel: {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can also be reused in the MarkAsCompleteModal.

Also, the Resource completed string appears in both MarkAsCompleteModal and the CompletionModal. Can you move it in the commonLearn strings and reuse?

message: 'Mark resource as complete',
context:
'Title of the modal window where a user will confirm or cancel marking a resource as complete manually',
},
resourceHidden: {
message: 'Resource hidden',
context:
'Notification message indicating the resource has been marked as hidden for future category searches.',
},
suggestedTimeToComplete: {
message: 'Suggested time to complete',
context: 'Tooltip label indicating the approximate time needed to complete the resource.',
},
multipleLearningActivities: {
message: 'Multiple learning activities',
context: 'Label indicating the resource contains multiple learning activities',
},
});

export default {
Expand Down