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

Topic to folder #3307

Merged
merged 6 commits into from
Dec 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 folders 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 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}',
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
},
},
$trs: {
topicTitle: 'Topic title',
topicTitleRequired: 'Title is required',
createTopic: 'Create new topic',
topicTitle: 'Folder title',
topicTitleRequired: 'Folder title is required',
createTopic: 'Create new folder',
cancel: 'Cancel',
create: 'Create',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
headerDiff: 'Net changes',
typeVersion: 'API version',
typeFileSize: 'File size',
typeTopics: 'Topics',
typeTopics: 'Folders',
typeVideos: 'Videos',
typeAudios: 'Audios',
typeExercises: 'Exercises',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -399,12 +399,12 @@ describe('StagingTreePage', () => {

it('renders live topics and resources counts', () => {
const text = getDeployDialogLiveResources(wrapper).text();
expect(removeMultipleSpaces(text)).toBe('Live resources: 0 topics , 0 resources');
expect(removeMultipleSpaces(text)).toBe('Live resources: 0 folders , 0 resources');
});

it('renders staged topics and resources counts', () => {
const text = getDeployDialogStagedResources(wrapper).text();
expect(removeMultipleSpaces(text)).toBe('Staged resources: 1 topic , 2 resources');
expect(removeMultipleSpaces(text)).toBe('Staged resources: 1 folder , 2 resources');
});

it('dispatches deploy channel action on deploy channel button click', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@
},
},
$trs: {
addTopic: 'New topic',
addTopic: 'New folder',
addExercise: 'New exercise',
uploadFiles: 'Upload files',
importFromChannels: 'Import from channels',
Expand All @@ -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...',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
$trs: {
coachContent: 'Resources for coaches',
assessments: 'Assessments',
topicsHidden: 'No topics',
topicsHidden: 'No folders',
createdAfter: "Added after '{date}'",
clearAll: 'Clear all',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.',
Expand Down
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/frontend/shared/mixins.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
},
$trs: {
topic: 'Topic',
topic: 'Folder',
video: 'Video',
audio: 'Audio',
exercise: 'Exercise',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading