From 0764c0e562a483bc4e8c634c471df5e194ac012a Mon Sep 17 00:00:00 2001 From: Marijan Andonoski Date: Tue, 30 Nov 2021 15:02:46 +0100 Subject: [PATCH 1/4] #3289 change Topic to Folder in tr strings --- .../channelEdit/components/ContentNodeChangedIcon.vue | 4 ++-- .../channelEdit/components/ContentNodeListItem/index.vue | 2 +- .../frontend/channelEdit/components/ContentNodeOptions.vue | 4 ++-- .../frontend/channelEdit/components/edit/DetailsTabView.vue | 2 +- .../frontend/channelEdit/components/edit/EditModal.vue | 4 ++-- .../frontend/channelEdit/components/edit/EditView.vue | 4 ++-- .../frontend/channelEdit/components/move/NewTopicModal.vue | 6 +++--- .../views/ImportFromChannels/ContentTreeList.vue | 2 +- .../views/ImportFromChannels/SearchFilterBar.vue | 2 +- .../channelEdit/views/ImportFromChannels/SearchFilters.vue | 2 +- .../frontend/channelEdit/views/NodePanel.vue | 2 +- .../frontend/channelEdit/views/TreeView/index.vue | 2 +- .../contentcuration/frontend/shared/leUtils/ContentKinds.js | 2 +- contentcuration/contentcuration/frontend/shared/mixins.js | 2 +- .../frontend/shared/views/ContentNodeIcon.vue | 2 +- requirements-dev.txt | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeChangedIcon.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeChangedIcon.vue index 6427f1bb66..ea407e1f9b 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeChangedIcon.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeChangedIcon.vue @@ -67,9 +67,9 @@ $trs: { containsNewAndUpdated: 'Contains unpublished resources and changes', containsNew: 'Contains unpublished resources', - isNewTopic: 'Unpublished topic', + isNewTopic: 'Unpublished folder', containsUpdated: 'Contains unpublished changes', - isUpdatedTopic: 'Topic has been updated since last publish', + isUpdatedTopic: 'Folder has been updated since last publish', isNewResource: 'Unpublished', isUpdatedResource: 'Updated since last publish', }, diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue index a32834b929..357af90a18 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue @@ -271,7 +271,7 @@ $trs: { resources: '{value, number, integer} {value, plural, one {resource} other {resources}}', questions: '{value, number, integer} {value, plural, one {question} other {questions}}', - openTopic: 'Open topic', + openTopic: 'Open folder', hasCoachTooltip: '{value, number, integer} {value, plural, one {resource for coaches} other {resources for coaches}}', coachTooltip: 'Resource for coaches', diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue index e0cc21cda0..25ef1514d4 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue @@ -210,8 +210,8 @@ }, $trs: { - newSubtopic: 'New topic', - editTopicDetails: 'Edit topic details', + newSubtopic: 'New folder', + editTopicDetails: 'Edit folder details', editDetails: 'Edit details', viewDetails: 'View details', move: 'Move', diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue index 0d5596bc89..8bcdefbbe3 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue @@ -660,7 +660,7 @@ assessmentHeader: 'Assessment options', thumbnailHeader: 'Thumbnail', titleLabel: 'Title', - languageHelpText: 'Leave blank to use the topic language', + languageHelpText: 'Leave blank to use the folder language', languageChannelHelpText: 'Leave blank to use the channel language', importedFromButtonText: 'Imported from {channel}', detectedImportText: diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue index 5247a64aa2..0873f2f385 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue @@ -500,7 +500,7 @@ uploadFilesHeader: 'Upload files', editFilesHeader: 'Edit files', createExerciseHeader: 'New exercise', - addTopicsHeader: 'New topic', + addTopicsHeader: 'New folder', invalidNodesFound: '{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}', invalidNodesFoundText: @@ -509,7 +509,7 @@ keepEditingButton: 'Keep editing', saveFailedHeader: 'Save failed', saveFailedText: 'There was a problem saving your content', - addTopic: 'Add new topic', + addTopic: 'Add new folder', uploadButton: 'Upload more', uploadInProgressHeader: 'Upload in progress', uploadInProgressText: 'Uploads that are in progress will be lost if you exit', diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue index 5098df72d7..a4a5a306e7 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue @@ -257,11 +257,11 @@ [TabNames.PREVIEW]: 'Preview', [TabNames.QUESTIONS]: 'Questions', [TabNames.RELATED]: 'Related', - noItemsToEditText: 'Please select resources or topics to edit', + noItemsToEditText: 'Please select resources or forders to edit', invalidFieldsToolTip: 'Some required information is missing', errorBannerText: 'Please provide the required information', editingMultipleCount: - 'Editing details for {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', + 'Editing details for {topicCount, plural,\n =1 {# topic}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', }, }; diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue index dda47ec54d..7cbe08b073 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue @@ -73,9 +73,9 @@ }, }, $trs: { - topicTitle: 'Topic title', - topicTitleRequired: 'Title is required', - createTopic: 'Create new topic', + topicTitle: 'Folder title', + topicTitleRequired: 'Folder is required', + createTopic: 'Create new Folder', cancel: 'Cancel', create: 'Create', }, diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue index c9f3a23236..3dc29fad36 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue @@ -178,7 +178,7 @@ }, $trs: { allChannelsLabel: 'Channels', - noResourcesOrTopics: 'There are no resources or topics here', + noResourcesOrTopics: 'There are no resources or folders here', selectAllAction: 'Select all', }, }; diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue index 02bf30037f..10c0ad2a53 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue @@ -121,7 +121,7 @@ $trs: { coachContent: 'Resources for coaches', assessments: 'Assessments', - topicsHidden: 'No topics', + topicsHidden: 'No folders', createdAfter: "Added after '{date}'", clearAll: 'Clear all', }, diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue index 9f9f146bef..ea0ea9f2db 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue @@ -212,7 +212,7 @@ channelSourceLabel: 'Channel/source', filtersHeader: 'Filter options', kindLabel: 'Format', - hideTopicsLabel: 'Hide topics', + hideTopicsLabel: 'Hide folders', assessmentsLabel: 'Show assessments only', licensesLabel: 'License', coachContentLabel: 'Show resources for coaches', diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue index a177fc6474..8928b83254 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue @@ -149,7 +149,7 @@ }, $trs: { emptyViewOnlyChannelText: 'Nothing in this channel yet', - emptyTopicText: 'Nothing in this topic yet', + emptyTopicText: 'Nothing in this folder yet', emptyChannelText: 'Click "ADD" to start building your channel', emptyChannelSubText: 'Create, upload, or import resources from other channels', }, diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue index 97aae4d603..0ef6f2ede6 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue @@ -396,7 +396,7 @@ $trs: { showSidebar: 'Show sidebar', collapseAllButton: 'Collapse all', - openCurrentLocationButton: 'Expand to current topic location', + openCurrentLocationButton: 'Expand to current folder location', updatedResourcesReadyForReview: 'Updated resources are ready for review', closeDrawer: 'Close', }, diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js b/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js index 715e7ce2df..d56cd547a9 100644 --- a/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js +++ b/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js @@ -22,7 +22,7 @@ export const ContentKindsNames = { H5P: 'h5p', HTML5: 'html5', SLIDESHOW: 'slideshow', - TOPIC: 'topic', + TOPIC: 'folder', VIDEO: 'video', ZIM: 'zim', }; diff --git a/contentcuration/contentcuration/frontend/shared/mixins.js b/contentcuration/contentcuration/frontend/shared/mixins.js index f7d4575e3a..a44ed67503 100644 --- a/contentcuration/contentcuration/frontend/shared/mixins.js +++ b/contentcuration/contentcuration/frontend/shared/mixins.js @@ -124,7 +124,7 @@ export const constantStrings = createTranslator('ConstantStrings', { svg: 'SVG image', perseus: 'Perseus Exercise', zip: 'HTML5 zip', - topic: 'Topic', + topic: 'Folder', video: 'Video', audio: 'Audio', document: 'Document', diff --git a/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue b/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue index b5d3d0c9ae..874b084810 100644 --- a/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue +++ b/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue @@ -92,7 +92,7 @@ }, }, $trs: { - topic: 'Topic', + topic: 'Folder', video: 'Video', audio: 'Audio', exercise: 'Exercise', diff --git a/requirements-dev.txt b/requirements-dev.txt index e87e92ea2f..e68dbf6dd7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -143,7 +143,7 @@ inflection==0.5.1 # via drf-yasg iniconfig==1.1.1 # via pytest -ipdb==0.13.7 +ipdb==0.13.4 # via -r requirements-dev.in ipython==7.16.1 # via ipdb From 71ff75d2a353497bb3ac86011d15de90d01a39ad Mon Sep 17 00:00:00 2001 From: Marijan Andonoski Date: Tue, 30 Nov 2021 15:54:13 +0100 Subject: [PATCH 2/4] #3289:reverted contentkind change from folder to topic --- .../contentcuration/frontend/shared/leUtils/ContentKinds.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js b/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js index d56cd547a9..715e7ce2df 100644 --- a/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js +++ b/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js @@ -22,7 +22,7 @@ export const ContentKindsNames = { H5P: 'h5p', HTML5: 'html5', SLIDESHOW: 'slideshow', - TOPIC: 'folder', + TOPIC: 'topic', VIDEO: 'video', ZIM: 'zim', }; From e03eb5b425054d39ac4beaef30c17b53efc28fc4 Mon Sep 17 00:00:00 2001 From: Marijan Andonoski Date: Thu, 2 Dec 2021 15:21:43 +0100 Subject: [PATCH 3/4] #3289: finalisation of topic to folder conversion --- .../components/Clipboard/index.vue | 2 +- .../channelEdit/components/edit/EditView.vue | 2 +- .../channelEdit/components/move/MoveModal.vue | 6 +- .../pages/StagingTreePage/DiffTable.vue | 2 +- .../pages/StagingTreePage/index.vue | 6 +- .../channelEdit/views/CurrentTopicView.vue | 4 +- .../channelEdit/views/trash/TrashModal.vue | 4 +- .../channelList/views/Channel/CatalogFAQ.vue | 2 +- .../settings/pages/UsingStudio/index.vue | 6 +- .../views/policies/TermsOfServiceModal.vue | 2 +- .../LC_MESSAGES/contentcuration-messages.json | 74 +++++++++---------- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue index d0f9d9e740..deeb8234ba 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue @@ -408,7 +408,7 @@ copiedItemsToClipboard: 'Copied in clipboard', emptyDefaultTitle: 'No resources in your clipboard', emptyDefaultText: - 'Use the clipboard to copy resources and move them to other topics and channels', + 'Use the clipboard to copy resources and move them to other folders and channels', backToClipboard: 'Clipboard', }, }; diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue index a4a5a306e7..13f97c8c3b 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue @@ -261,7 +261,7 @@ invalidFieldsToolTip: 'Some required information is missing', errorBannerText: 'Please provide the required information', editingMultipleCount: - 'Editing details for {topicCount, plural,\n =1 {# topic}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', + 'Editing details for {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', }, }; diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue index c6922d2a50..1df24c046d 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue @@ -288,13 +288,13 @@ }, $trs: { moveItems: - 'Move {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}} into:', - addTopic: 'Add new topic', + 'Move {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}} into:', + addTopic: 'Add new folder', cancel: 'Cancel', moveHere: 'Move here', resourcesCount: '{count, plural,\n =1 {# resource}\n other {# resources}}', emptyTopicText: 'No resources found', - topicCreatedMessage: 'New topic created', + topicCreatedMessage: 'New folder created', movedMessage: 'Moved to {title}', goToLocationButton: 'Go to location', }, diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue index b52c11dc41..ad43125c76 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue @@ -136,7 +136,7 @@ headerDiff: 'Net changes', typeVersion: 'API version', typeFileSize: 'File size', - typeTopics: 'Topics', + typeTopics: 'Folders', typeVideos: 'Videos', typeAudios: 'Audios', typeExercises: 'Exercises', diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue index 95c2018ada..3b81f636be 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue @@ -520,9 +520,9 @@ reviewMode: 'Review mode', emptyChannelText: 'No resources found', emptyChannelSubText: - 'No changes to review! The channel contains all the latest topics and resources.', + 'No changes to review! The channel contains all the latest folders and resources.', collapseAllButton: 'Collapse all', - openCurrentLocationButton: 'Jump to current topic location', + openCurrentLocationButton: 'Jump to current folder location', totalResources: 'Total resources', totalSize: 'Total size', openSummaryDetailsDialogBtn: 'View summary', @@ -532,7 +532,7 @@ deployDialogDescription: 'You are about to replace all live resources with staged resources.', liveResources: 'Live resources', stagedResources: 'Staged resources', - topicsCount: '{count, number} {count, plural, one { topic } other { topics }}', + topicsCount: '{count, number} {count, plural, one { folder } other { folders }}', resourcesCount: '{count, number} {count, plural, one { resource } other { resources }}', cancelDeployBtn: 'Cancel', confirmDeployBtn: 'Deploy channel', diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue index 424f2fbd9c..1cb022bd80 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue @@ -679,7 +679,7 @@ }, }, $trs: { - addTopic: 'New topic', + addTopic: 'New folder', addExercise: 'New exercise', uploadFiles: 'Upload files', importFromChannels: 'Import from channels', @@ -696,7 +696,7 @@ duplicateSelectedButton: 'Make a copy', deleteSelectedButton: 'Delete', selectionCount: - '{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', + '{topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', undo: 'Undo', cancel: 'Cancel', creatingCopies: 'Copying...', diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue index 8299f4bbd2..e95d57aef1 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue @@ -262,11 +262,11 @@ selectAllHeader: 'Select all', deletedHeader: 'Removed', selectedCountText: - '{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', + '{topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}', deleteButton: 'Delete', restoreButton: 'Restore', deleteConfirmationHeader: - 'Permanently delete {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}?', + 'Permanently delete {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}?', deleteConfirmationText: 'You cannot undo this action. Are you sure you want to continue?', deleteConfirmationDeleteButton: 'Delete permanently', deleteConfirmationCancelButton: 'Cancel', diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue index 9b427181bf..b1f8e7215b 100644 --- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue +++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue @@ -349,7 +349,7 @@ 'Here you can learn more about the educational resources publicly available for use in Kolibri, which are organized into "channels". Use the filters to browse channels by keyword, language, or formats of the materials inside.', channelLink: 'What is a channel?', descriptionP2: - 'Click on a channel to get a preview of what subjects and topics it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.', + 'Click on a channel to get a preview of what subjects and folders it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.', descriptionP3: "Sharing the work of these resource creators is what inspires Learning Equality's efforts. We hope you find something that excites you about the potential of digital learning, online or off!", diff --git a/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue b/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue index ebfa6c0407..b419336bb3 100644 --- a/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue +++ b/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue @@ -114,9 +114,9 @@ bestPractices: 'Best practices', bestPractice1: - 'When using import and clipboard operations, work with small subsets of topics instead of whole channels at once (especially for large channels).', + 'When using import and clipboard operations, work with small subsets of folders instead of whole channels at once (especially for large channels).', bestPractice2: - 'It is preferable to create multiple small channels rather than one giant channel with many layers of topics.', + 'It is preferable to create multiple small channels rather than one giant channel with many layers of folders.', bestPractice3: 'Reload the page often to ensure your work is saved to the server and no network errors have occurred. Use CTRL+R on Linux/Windows or ⌘+R on Mac.', bestPractice4: @@ -132,7 +132,7 @@ notableIssues: 'Notable issues', issue1: - 'Two users have reported isolated incidents where content they imported from another channel disappeared, leaving only empty topics and subtopics. In one report, the content later re-appeared. They did not experience these problems consistently, and the incidents may possibly involve issues with a slow or unstable internet connection. If you run into this issue, please contact us as soon as possible and let us know as much information as you can remember.', + 'Two users have reported isolated incidents where content they imported from another channel disappeared, leaving only empty folders and subfolders. In one report, the content later re-appeared. They did not experience these problems consistently, and the incidents may possibly involve issues with a slow or unstable internet connection. If you run into this issue, please contact us as soon as possible and let us know as much information as you can remember.', issueLink1: 'Reports of disappearing content', issue2: 'Some operations in Studio are currently very slow, and so it may appear that the change you attempted to make timed out or did not take effect. In many cases, the change is still being processed and will appear once it is complete. If, after 5-10 minutes, the change still has not taken effect even after a browser refresh, please file an issue. We are working on solutions to these issues.', diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue index a216bb6e7b..2668b4d9f7 100644 --- a/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue +++ b/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue @@ -418,7 +418,7 @@ licensingList2Item1: 'Descriptive metadata: This includes primary metadata associated with a single piece of Content, for example, titles, descriptions, and other elements which constitute a definitive part of the Content regardless of which system it appears on. These metadata elements will fall under the same copyright and licensing as the Content itself.', licensingList2Item2: - 'Organizational metadata: This defines how a piece of content may be used, aids with discovery, and places it within some broader structure of relations on the Service, for example, tags, curation into topics (including the titles of those topics), and other elements pertaining to the display and ordering of Content on the system itself. By using the Service, you agree that work you do to generate organizational metadata elements are released into the Public Domain, and may be made available for others to use, without any claim to copyright or restricted licensing. We may also share, leverage and distribute this organizational metadata. This is so that we can benefit others and improve the impact of our platforms.', + 'Organizational metadata: This defines how a piece of content may be used, aids with discovery, and places it within some broader structure of relations on the Service, for example, tags, curation into folders (including the titles of those folders), and other elements pertaining to the display and ordering of Content on the system itself. By using the Service, you agree that work you do to generate organizational metadata elements are released into the Public Domain, and may be made available for others to use, without any claim to copyright or restricted licensing. We may also share, leverage and distribute this organizational metadata. This is so that we can benefit others and improve the impact of our platforms.', // DMCA Policy dmcaHeader: 'DMCA Policy', diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json index 5d9af0a070..f9e0ba4bfc 100644 --- a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json +++ b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json @@ -114,7 +114,7 @@ "CatalogFAQ.customContentAnswer": "We would love to get in touch with you regarding your own materials or your recommendations. Please contact us at content@learningequality.org!", "CatalogFAQ.customContentQuestion": "How can I add my own materials or recommend materials from other creators for this library?", "CatalogFAQ.descriptionP1": "Here you can learn more about the educational resources publicly available for use in Kolibri, which are organized into \"channels\". Use the filters to browse channels by keyword, language, or formats of the materials inside.", - "CatalogFAQ.descriptionP2": "Click on a channel to get a preview of what subjects and topics it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.", + "CatalogFAQ.descriptionP2": "Click on a channel to get a preview of what subjects and folders it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.", "CatalogFAQ.descriptionP3": "Sharing the work of these resource creators is what inspires Learning Equality's efforts. We hope you find something that excites you about the potential of digital learning, online or off!", "CatalogFAQ.downloadKolibriLink": "Download Kolibri", "CatalogFAQ.downloadLink": "डाउनलोड (download)", @@ -399,7 +399,7 @@ "Clipboard.creatingClipboardCopies": "Copying in clipboard...", "Clipboard.deleteSelectedButton": "मिटाएँ", "Clipboard.duplicateSelectedButton": "Make a copy", - "Clipboard.emptyDefaultText": "Use the clipboard to copy resources and move them to other topics and channels", + "Clipboard.emptyDefaultText": "Use the clipboard to copy resources and move them to other folders and channels", "Clipboard.emptyDefaultTitle": "No resources in your clipboard", "Clipboard.moveSelectedButton": "विस्थापित करें", "Clipboard.removedFromClipboard": "Deleted from clipboard", @@ -486,7 +486,7 @@ "ConstantStrings.single_selection": "Single choice", "ConstantStrings.slideshow": "Slideshow", "ConstantStrings.svg": "SVG image", - "ConstantStrings.topic": "Topic", + "ConstantStrings.topic": "Folder", "ConstantStrings.topic_thumbnail": "Thumbnail", "ConstantStrings.true_false": "True/False", "ConstantStrings.unknown_question": "Unknown question type", @@ -513,9 +513,9 @@ "ContentNodeChangedIcon.containsNewAndUpdated": "Contains unpublished resources and changes", "ContentNodeChangedIcon.containsUpdated": "Contains unpublished changes", "ContentNodeChangedIcon.isNewResource": "Unpublished", - "ContentNodeChangedIcon.isNewTopic": "Unpublished topic", + "ContentNodeChangedIcon.isNewTopic": "Unpublished folder", "ContentNodeChangedIcon.isUpdatedResource": "Updated since last publish", - "ContentNodeChangedIcon.isUpdatedTopic": "Topic has been updated since last publish", + "ContentNodeChangedIcon.isUpdatedTopic": "Folder has been updated since last publish", "ContentNodeEditListItem.optionsTooltip": "विकल्प", "ContentNodeIcon.audio": "ऑडियो", "ContentNodeIcon.document": "दस्तावेज़", @@ -528,7 +528,7 @@ "ContentNodeListItem.coachTooltip": "Resource for coaches", "ContentNodeListItem.copyingTask": "Copying", "ContentNodeListItem.hasCoachTooltip": "{value, number, integer} {value, plural, one {resource for coaches} other {resources for coaches}}", - "ContentNodeListItem.openTopic": "Open topic", + "ContentNodeListItem.openTopic": "Open folder", "ContentNodeListItem.questions": "{value, number, integer} {value, plural, one {प्रश्न} other {प्रश्न}}", "ContentNodeListItem.resources": "{value, number, integer} {value, plural, one {संसाधन} other {संसाधन}}", "ContentNodeOptions.cancel": "रद्द करें", @@ -538,17 +538,17 @@ "ContentNodeOptions.creatingClipboardCopies": "Copying to clipboard...", "ContentNodeOptions.creatingCopies": "Copying...", "ContentNodeOptions.editDetails": "विवरण संपादित करें", - "ContentNodeOptions.editTopicDetails": "Edit topic details", + "ContentNodeOptions.editTopicDetails": "Edit folder details", "ContentNodeOptions.goToOriginalLocation": "Go to original location", "ContentNodeOptions.makeACopy": "Make a copy", "ContentNodeOptions.move": "विस्थापित करें", "ContentNodeOptions.moveTo": "Move to...", - "ContentNodeOptions.newSubtopic": "New topic", + "ContentNodeOptions.newSubtopic": "New folder", "ContentNodeOptions.remove": "हटा दें", "ContentNodeOptions.removedFromClipboard": "Deleted from clipboard", "ContentNodeOptions.removedItems": "Sent to trash", "ContentNodeOptions.removingItems": "Deleting from clipboard...", - "ContentNodeOptions.topicDefaultTitle": "{title} topic", + "ContentNodeOptions.topicDefaultTitle": "{title} folder", "ContentNodeOptions.undo": "अकृत करें", "ContentNodeOptions.viewDetails": "View details", "ContentNodeStrings.untitled": "Untitled", @@ -574,7 +574,7 @@ "ContentRenderer.noFileText": "Select a file to preview", "ContentRenderer.previewNotSupported": "Preview unavailable", "ContentTreeList.allChannelsLabel": "चैनल", - "ContentTreeList.noResourcesOrTopics": "There are no resources or topics here", + "ContentTreeList.noResourcesOrTopics": "There are no resources or folders here", "ContentTreeList.selectAllAction": "सभी का चयन करें", "CopyToken.copiedTokenId": "Token copied", "CopyToken.copyFailed": "Copy failed", @@ -635,7 +635,7 @@ "CurrentTopicView.DEFAULT_VIEW": "Default view", "CurrentTopicView.addButton": "Add", "CurrentTopicView.addExercise": "New exercise", - "CurrentTopicView.addTopic": "New topic", + "CurrentTopicView.addTopic": "New folder", "CurrentTopicView.cancel": "Cancel", "CurrentTopicView.copiedItemsToClipboard": "Copied to clipboard", "CurrentTopicView.copySelectedButton": "Copy to clipboard", @@ -651,7 +651,7 @@ "CurrentTopicView.optionsButton": "Options", "CurrentTopicView.removedItems": "Sent to trash", "CurrentTopicView.selectAllLabel": "Select all", - "CurrentTopicView.selectionCount": "{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}", + "CurrentTopicView.selectionCount": "{topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}", "CurrentTopicView.undo": "Undo", "CurrentTopicView.uploadFiles": "Upload files", "CurrentTopicView.viewModeTooltip": "View", @@ -689,7 +689,7 @@ "Details.publishedHeading": "Published on", "Details.resourceHeading": "Total resources", "Details.sampleFromChannelHeading": "Sample content from this channel", - "Details.sampleFromTopicHeading": "Sample content from this topic", + "Details.sampleFromTopicHeading": "Sample content from this folder", "Details.sizeHeading": "Channel size", "Details.sizeText": "{text} ({size})", "Details.subtitlesHeading": "Captions and subtitles", @@ -708,7 +708,7 @@ "DetailsTabView.detectedImportText": "{count, plural,\n =1 {# resource has view-only permission}\n other {# resources have view-only permission}}", "DetailsTabView.importedFromButtonText": "Imported from {channel}", "DetailsTabView.languageChannelHelpText": "Leave blank to use the channel language", - "DetailsTabView.languageHelpText": "Leave blank to use the topic language", + "DetailsTabView.languageHelpText": "Leave blank to use the folder language", "DetailsTabView.noTagsFoundText": "No results found for \"{text}\". Press 'Enter' key to create a new tag", "DetailsTabView.providerLabel": "Provider", "DetailsTabView.providerToolTip": "Organization that commissioned or is distributing the content", @@ -734,8 +734,8 @@ "DiffTable.typeVideos": "वीडियो", "EditList.selectAllLabel": "सभी का चयन करें", "EditListItem.questionCount": "{count, plural,\n =1 {# question}\n other {# questions}}", - "EditModal.addTopic": "Add new topic", - "EditModal.addTopicsHeader": "New topic", + "EditModal.addTopic": "Add new folder", + "EditModal.addTopicsHeader": "New folder", "EditModal.cancelUploadsButton": "बाहर निकलें", "EditModal.closeWithoutSavingButton": "Close without saving", "EditModal.createExerciseHeader": "New exercise", @@ -762,10 +762,10 @@ "EditSearchModal.saveChangesAction": "सेव करें", "EditSearchModal.searchTitleLabel": "Search title", "EditView.details": "Details", - "EditView.editingMultipleCount": "Editing details for {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}", + "EditView.editingMultipleCount": "Editing details for {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}", "EditView.errorBannerText": "Please provide the required information", "EditView.invalidFieldsToolTip": "Some required information is missing", - "EditView.noItemsToEditText": "Please select resources or topics to edit", + "EditView.noItemsToEditText": "Please select resources or folders to edit", "EditView.preview": "Preview", "EditView.questions": "Questions", "EditView.related": "Related", @@ -899,24 +899,24 @@ "MasteryDropdown.masteryDescripiton": "Kolibri marks an exercise as \"completed\" when the mastery criteria is met. Here are the different types of mastery criteria for an exercise:", "MasteryDropdown.nHint": "Recent answers", "MessageLayout.backToLogin": "Continue to sign-in page", - "MoveModal.addTopic": "Add new topic", + "MoveModal.addTopic": "Add new folder", "MoveModal.cancel": "रद्द करें", "MoveModal.emptyTopicText": "No resources found", "MoveModal.goToLocationButton": "Go to location", "MoveModal.moveHere": "Move here", - "MoveModal.moveItems": "Move {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}} into:", + "MoveModal.moveItems": "Move {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}} into:", "MoveModal.movedMessage": "Moved to {title}", "MoveModal.resourcesCount": "{count, plural,\n =1 {# resource}\n other {# resources}}", - "MoveModal.topicCreatedMessage": "New topic created", + "MoveModal.topicCreatedMessage": "New folder created", "MultiSelect.noItemsFound": "No items found", "NewTopicModal.cancel": "रद्द करें", "NewTopicModal.create": "बनाएँ", - "NewTopicModal.createTopic": "Create new topic", - "NewTopicModal.topicTitle": "Topic title", + "NewTopicModal.createTopic": "Create new folder", + "NewTopicModal.topicTitle": "Folder title", "NewTopicModal.topicTitleRequired": "Title is required", "NodePanel.emptyChannelSubText": "Create, upload, or import resources from other channels", "NodePanel.emptyChannelText": "Click \"ADD\" to start building your channel", - "NodePanel.emptyTopicText": "Nothing in this topic yet", + "NodePanel.emptyTopicText": "Nothing in this folder yet", "NodePanel.emptyViewOnlyChannelText": "Nothing in this channel yet", "NodeTreeNavigation.noResourcesDefaultText": "No resources found", "OfflineText.offlineIndicatorText": "Offline", @@ -1125,7 +1125,7 @@ "SearchFilterBar.clearAll": "Clear all", "SearchFilterBar.coachContent": "Resources for coaches", "SearchFilterBar.createdAfter": "Added after '{date}'", - "SearchFilterBar.topicsHidden": "No topics", + "SearchFilterBar.topicsHidden": "No folders", "SearchFilters.addedAfterDateLabel": "Added after", "SearchFilters.assessmentsLabel": "Show assessments only", "SearchFilters.channelSourceLabel": "Channel/source", @@ -1133,7 +1133,7 @@ "SearchFilters.channelsHeader": "चैनल", "SearchFilters.coachContentLabel": "Show resources for coaches", "SearchFilters.filtersHeader": "Filter options", - "SearchFilters.hideTopicsLabel": "Hide topics", + "SearchFilters.hideTopicsLabel": "Hide folders", "SearchFilters.kindLabel": "Format", "SearchFilters.licensesLabel": "लाइसेंस", "SearchOrBrowseWindow.backToBrowseAction": "Back to browse", @@ -1163,17 +1163,17 @@ "StagingTreePage.deploy": "Deploy", "StagingTreePage.deployChannel": "Deploy channel", "StagingTreePage.deployDialogDescription": "You are about to replace all live resources with staged resources.", - "StagingTreePage.emptyChannelSubText": "No changes to review! The channel contains all the latest topics and resources.", + "StagingTreePage.emptyChannelSubText": "No changes to review! The channel contains all the latest folders and resources.", "StagingTreePage.emptyChannelText": "No resources found", - "StagingTreePage.emptyTopicText": "This topic is empty", + "StagingTreePage.emptyTopicText": "This folder is empty", "StagingTreePage.liveResources": "Live resources", - "StagingTreePage.openCurrentLocationButton": "Jump to current topic location", + "StagingTreePage.openCurrentLocationButton": "Jump to current folder location", "StagingTreePage.openSummaryDetailsDialogBtn": "View summary", "StagingTreePage.resourcesCount": "{count, number} {count, plural, one { resource } other { resources }}", "StagingTreePage.reviewMode": "Review mode", "StagingTreePage.stagedResources": "Staged resources", "StagingTreePage.summaryDetailsDialogTitle": "Summary details", - "StagingTreePage.topicsCount": "{count, number} {count, plural, one { topic } other { topics }}", + "StagingTreePage.topicsCount": "{count, number} {count, plural, one { folder } other { folders }}", "StagingTreePage.totalResources": "Total resources", "StagingTreePage.totalSize": "कुल आकार", "StagingTreePage.viewDetails": "View details", @@ -1275,7 +1275,7 @@ "TermsOfServiceModal.licensingList1Item2": "If you are not yourself the copyright holder, you must have the rights to distribute the uploaded Content, either through explicit written permission from the copyright holder, or as allowed by the terms of the license under which the Content has been released.", "TermsOfServiceModal.licensingList1Item3": "If you are the copyright holder of the uploaded content, then by marking the Content you upload with a particular license, you are agreeing for the Content to be distributed and used under the terms of that license in perpetuity.", "TermsOfServiceModal.licensingList2Item1": "Descriptive metadata: This includes primary metadata associated with a single piece of Content, for example, titles, descriptions, and other elements which constitute a definitive part of the Content regardless of which system it appears on. These metadata elements will fall under the same copyright and licensing as the Content itself.", - "TermsOfServiceModal.licensingList2Item2": "Organizational metadata: This defines how a piece of content may be used, aids with discovery, and places it within some broader structure of relations on the Service, for example, tags, curation into topics (including the titles of those topics), and other elements pertaining to the display and ordering of Content on the system itself. By using the Service, you agree that work you do to generate organizational metadata elements are released into the Public Domain, and may be made available for others to use, without any claim to copyright or restricted licensing. We may also share, leverage and distribute this organizational metadata. This is so that we can benefit others and improve the impact of our platforms.", + "TermsOfServiceModal.licensingList2Item2": "Organizational metadata: This defines how a piece of content may be used, aids with discovery, and places it within some broader structure of relations on the Service, for example, tags, curation into folders (including the titles of those topics), and other elements pertaining to the display and ordering of Content on the system itself. By using the Service, you agree that work you do to generate organizational metadata elements are released into the Public Domain, and may be made available for others to use, without any claim to copyright or restricted licensing. We may also share, leverage and distribute this organizational metadata. This is so that we can benefit others and improve the impact of our platforms.", "TermsOfServiceModal.licensingP1": "The Service allows you to upload and distribute Content. When you do, the following terms apply:", "TermsOfServiceModal.licensingP2": "We follow a policy of making content, including its associated metadata, as open as possible while following the appropriate copyright laws. With this in mind, we distinguish between:", "TermsOfServiceModal.miscellaneousHeader": "Miscellaneous", @@ -1322,19 +1322,19 @@ "TrashModal.deleteButton": "हटाएँ", "TrashModal.deleteConfirmationCancelButton": "रद्द करें", "TrashModal.deleteConfirmationDeleteButton": "Delete permanently", - "TrashModal.deleteConfirmationHeader": "Permanently delete {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}?", + "TrashModal.deleteConfirmationHeader": "Permanently delete {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}?", "TrashModal.deleteConfirmationText": "You cannot undo this action. Are you sure you want to continue?", "TrashModal.deleteSuccessMessage": "Permanently deleted", "TrashModal.deletedHeader": "हटाया गया", "TrashModal.restoreButton": "Restore", "TrashModal.selectAllHeader": "सभी का चयन करें", - "TrashModal.selectedCountText": "{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}", + "TrashModal.selectedCountText": "{topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}", "TrashModal.trashEmptySubtext": "Resources removed from this channel will appear here", "TrashModal.trashEmptyText": "Trash is empty", "TrashModal.trashModalTitle": "Trash", "TreeView.closeDrawer": "बंद (close)", "TreeView.collapseAllButton": "Collapse all", - "TreeView.openCurrentLocationButton": "Expand to current topic location", + "TreeView.openCurrentLocationButton": "Expand to current folder location", "TreeView.showSidebar": "Show sidebar", "TreeView.updatedResourcesReadyForReview": "Updated resources are ready for review", "TreeViewBase.apiGenerated": "Generated by API", @@ -1367,8 +1367,8 @@ "Uploader.uploadSize": "Upload is too large: {size}", "UsingStudio.aboutStudio": "About Kolibri Studio", "UsingStudio.aboutStudioText": "Kolibri Studio is undergoing active development, and as such, some changes could cause unexpected behavior or challenges (also known as \"issues\"). If you encounter an issue, please notify us as soon as they occur to help us resolve them. (See below for instructions on how to report issues.)", - "UsingStudio.bestPractice1": "When using import and clipboard operations, work with small subsets of topics instead of whole channels at once (especially for large channels).", - "UsingStudio.bestPractice2": "It is preferable to create multiple small channels rather than one giant channel with many layers of topics.", + "UsingStudio.bestPractice1": "When using import and clipboard operations, work with small subsets of folders instead of whole channels at once (especially for large channels).", + "UsingStudio.bestPractice2": "It is preferable to create multiple small channels rather than one giant channel with many layers of folders.", "UsingStudio.bestPractice3": "Reload the page often to ensure your work is saved to the server and no network errors have occurred. Use CTRL+R on Linux/Windows or ⌘+R on Mac.", "UsingStudio.bestPractice4": "Avoid simultaneous edits on the same channel. Channels should not be edited by multiple users at the same time or by the same user in multiple browser windows.", "UsingStudio.bestPractice5": "It is possible that you will encounter timeout errors in your browser when performing operations like import and sync, on large channels. Don't be alarmed by this error message and do not repeat the same operation again right away. It doesn't mean the operation has failed- Kolibri Studio is still working in the background. Wait a few minutes and reload the page before continuing your edits.", @@ -1378,7 +1378,7 @@ "UsingStudio.bestPractice9": "Report issues as you encounter them.", "UsingStudio.bestPractices": "Best practices", "UsingStudio.communityStandardsLink": "Community standards", - "UsingStudio.issue1": "Two users have reported isolated incidents where content they imported from another channel disappeared, leaving only empty topics and subtopics. In one report, the content later re-appeared. They did not experience these problems consistently, and the incidents may possibly involve issues with a slow or unstable internet connection. If you run into this issue, please contact us as soon as possible and let us know as much information as you can remember.", + "UsingStudio.issue1": "Two users have reported isolated incidents where content they imported from another channel disappeared, leaving only empty folders and subfolders. In one report, the content later re-appeared. They did not experience these problems consistently, and the incidents may possibly involve issues with a slow or unstable internet connection. If you run into this issue, please contact us as soon as possible and let us know as much information as you can remember.", "UsingStudio.issue2": "Some operations in Studio are currently very slow, and so it may appear that the change you attempted to make timed out or did not take effect. In many cases, the change is still being processed and will appear once it is complete. If, after 5-10 minutes, the change still has not taken effect even after a browser refresh, please file an issue. We are working on solutions to these issues.", "UsingStudio.issueLink1": "Reports of disappearing content", "UsingStudio.issueLink2": "Slow performance can lead to unexpected errors in the interface", From beeae26b9881a6f31a6ee8790cb9a131d1ac0738 Mon Sep 17 00:00:00 2001 From: Marijan Andonoski Date: Mon, 6 Dec 2021 15:19:46 +0100 Subject: [PATCH 4/4] #3289: fixed some typos, added radinas suggestions --- .../frontend/channelEdit/components/edit/EditView.vue | 2 +- .../frontend/channelEdit/components/move/NewTopicModal.vue | 4 ++-- .../frontend/channelList/views/Channel/CatalogFAQ.vue | 2 +- .../locale/hi_IN/LC_MESSAGES/contentcuration-messages.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue index 13f97c8c3b..0d5265d562 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue @@ -257,7 +257,7 @@ [TabNames.PREVIEW]: 'Preview', [TabNames.QUESTIONS]: 'Questions', [TabNames.RELATED]: 'Related', - noItemsToEditText: 'Please select resources or forders to edit', + noItemsToEditText: 'Please select resources or folders to edit', invalidFieldsToolTip: 'Some required information is missing', errorBannerText: 'Please provide the required information', editingMultipleCount: diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue index 7cbe08b073..cf701fd03d 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/NewTopicModal.vue @@ -74,8 +74,8 @@ }, $trs: { topicTitle: 'Folder title', - topicTitleRequired: 'Folder is required', - createTopic: 'Create new Folder', + topicTitleRequired: 'Folder title is required', + createTopic: 'Create new folder', cancel: 'Cancel', create: 'Create', }, diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue index b1f8e7215b..9b427181bf 100644 --- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue +++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue @@ -349,7 +349,7 @@ 'Here you can learn more about the educational resources publicly available for use in Kolibri, which are organized into "channels". Use the filters to browse channels by keyword, language, or formats of the materials inside.', channelLink: 'What is a channel?', descriptionP2: - 'Click on a channel to get a preview of what subjects and folders it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.', + 'Click on a channel to get a preview of what subjects and topics it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.', descriptionP3: "Sharing the work of these resource creators is what inspires Learning Equality's efforts. We hope you find something that excites you about the potential of digital learning, online or off!", diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json index f9e0ba4bfc..d46a1aac59 100644 --- a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json +++ b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json @@ -114,7 +114,7 @@ "CatalogFAQ.customContentAnswer": "We would love to get in touch with you regarding your own materials or your recommendations. Please contact us at content@learningequality.org!", "CatalogFAQ.customContentQuestion": "How can I add my own materials or recommend materials from other creators for this library?", "CatalogFAQ.descriptionP1": "Here you can learn more about the educational resources publicly available for use in Kolibri, which are organized into \"channels\". Use the filters to browse channels by keyword, language, or formats of the materials inside.", - "CatalogFAQ.descriptionP2": "Click on a channel to get a preview of what subjects and folders it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.", + "CatalogFAQ.descriptionP2": "Click on a channel to get a preview of what subjects and topics it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.", "CatalogFAQ.descriptionP3": "Sharing the work of these resource creators is what inspires Learning Equality's efforts. We hope you find something that excites you about the potential of digital learning, online or off!", "CatalogFAQ.downloadKolibriLink": "Download Kolibri", "CatalogFAQ.downloadLink": "डाउनलोड (download)",