diff --git a/rdmo/management/assets/js/components/edit/EditCatalog.js b/rdmo/management/assets/js/components/edit/EditCatalog.js index e179456943..1e91fd17fd 100644 --- a/rdmo/management/assets/js/components/edit/EditCatalog.js +++ b/rdmo/management/assets/js/components/edit/EditCatalog.js @@ -95,8 +95,8 @@ const EditCatalog = ({ config, catalog, elements, elementActions }) => { } - {get(config, 'settings.groups') && { - { - - { } - - {get(config, 'settings.multisite') && { } - @@ -147,13 +147,13 @@ const EditQuestion = ({ config, question, elements, elementActions}) => { - - diff --git a/rdmo/management/assets/js/components/edit/EditQuestionSet.js b/rdmo/management/assets/js/components/edit/EditQuestionSet.js index fd227ff2dc..3204887ef0 100644 --- a/rdmo/management/assets/js/components/edit/EditQuestionSet.js +++ b/rdmo/management/assets/js/components/edit/EditQuestionSet.js @@ -147,17 +147,18 @@ const EditQuestionSet = ({ config, questionset, elements, elementActions }) => { } - - {get(config, 'settings.multisite') && { } - {get(config, 'settings.multisite') && { } - { +const MultiSelect = ({ config, element, field, options, addText, createText, onChange, onCreate, onEdit }) => { const id = getId(element, field), label = getLabel(config, element, field), help = getHelp(config, element, field), @@ -82,7 +82,7 @@ const MultiSelect = ({ config, element, field, options, verboseName, onChange, o handleAdd()} disabled={element.read_only}> - {interpolate(gettext('Add %s'), [verboseName])} + {addText} { @@ -90,7 +90,7 @@ const MultiSelect = ({ config, element, field, options, verboseName, onChange, o - {interpolate(gettext('Create new %s'), [verboseName])} + {createText} } @@ -104,7 +104,8 @@ MultiSelect.propTypes = { element: PropTypes.object, field: PropTypes.string, options: PropTypes.array, - verboseName: PropTypes.string, + addText: PropTypes.string, + createText: PropTypes.string, onChange: PropTypes.func, onCreate: PropTypes.func, onEdit: PropTypes.func diff --git a/rdmo/management/assets/js/components/edit/common/OrderedMultiSelect.js b/rdmo/management/assets/js/components/edit/common/OrderedMultiSelect.js index 482c8d7a2b..722e388cae 100644 --- a/rdmo/management/assets/js/components/edit/common/OrderedMultiSelect.js +++ b/rdmo/management/assets/js/components/edit/common/OrderedMultiSelect.js @@ -202,8 +202,8 @@ class OrderedMultiSelect extends Component { } render() { - const { config, element, field, verboseName, verboseNameCreate, - verboseNameAltCreate, onCreate, onAltCreate } = this.props + const { config, element, field, addText, createText, altCreateText, + onCreate, onAltCreate } = this.props const id = getId(element, field), label = getLabel(config, element, field), @@ -239,14 +239,14 @@ class OrderedMultiSelect extends Component { this.handleAdd()} disabled={element.read_only}> - {interpolate(gettext('Add existing %s'), [verboseName])} + {addText} { onCreate && - {interpolate(gettext('Create new %s'), [verboseNameCreate || verboseName])} + {createText} } { @@ -254,7 +254,7 @@ class OrderedMultiSelect extends Component { - {interpolate(gettext('Create new %s'), [verboseNameAltCreate || verboseName])} + {altCreateText} } @@ -284,9 +284,9 @@ OrderedMultiSelect.propTypes = { fields: PropTypes.array, options: PropTypes.array.isRequired, values: PropTypes.array, - verboseName: PropTypes.string.isRequired, - verboseNameCreate: PropTypes.string, - verboseNameAltCreate: PropTypes.string, + addText: PropTypes.string.isRequired, + createText: PropTypes.string, + altCreateText: PropTypes.string, onChange: PropTypes.func.isRequired, onCreate: PropTypes.func, onAltCreate: PropTypes.func, diff --git a/rdmo/management/assets/js/components/edit/common/Select.js b/rdmo/management/assets/js/components/edit/common/Select.js index df024a1d3a..afb5be1e86 100644 --- a/rdmo/management/assets/js/components/edit/common/Select.js +++ b/rdmo/management/assets/js/components/edit/common/Select.js @@ -11,7 +11,7 @@ import Link from 'rdmo/core/assets/js/components/Link' import { getId, getLabel, getHelp } from 'rdmo/management/assets/js/utils/forms' -const Select = ({ config, element, field, options, verboseName, isMulti, onChange, onCreate, onEdit }) => { +const Select = ({ config, element, field, options, createText, isMulti, onChange, onCreate, onEdit }) => { const id = getId(element, field), label = getLabel(config, element, field), help = getHelp(config, element, field), @@ -68,7 +68,7 @@ const Select = ({ config, element, field, options, verboseName, isMulti, onChang onCreate && - {interpolate(gettext('Create new %s'), [verboseName])} + {createText} } @@ -86,7 +86,7 @@ Select.propTypes = { element: PropTypes.object, field: PropTypes.string, options: PropTypes.array, - verboseName: PropTypes.string, + createText: PropTypes.string, isMulti: PropTypes.bool, onChange: PropTypes.func, onCreate: PropTypes.func, diff --git a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js index b0b90eb123..16780f7e8e 100644 --- a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js +++ b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js @@ -27,47 +27,47 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) => elementActions.fetchElements('catalogs')}>Catalogs + onClick={() => elementActions.fetchElements('catalogs')}>{gettext('Catalogs')} elementActions.fetchElements('sections')}>Sections + onClick={() => elementActions.fetchElements('sections')}>{gettext('Sections')} elementActions.fetchElements('pages')}>Pages + onClick={() => elementActions.fetchElements('pages')}>{gettext('Pages')} elementActions.fetchElements('questionsets')}>Question sets + onClick={() => elementActions.fetchElements('questionsets')}>{gettext('Question sets')} elementActions.fetchElements('questions')}>Questions + onClick={() => elementActions.fetchElements('questions')}>{gettext('Questions')} elementActions.fetchElements('attributes')}>Attributes + onClick={() => elementActions.fetchElements('attributes')}>{gettext('Attributes')} elementActions.fetchElements('optionsets')}>Option sets + onClick={() => elementActions.fetchElements('optionsets')}>{gettext('Option sets')} elementActions.fetchElements('options')}>Options + onClick={() => elementActions.fetchElements('options')}>{gettext('Options')} elementActions.fetchElements('conditions')}>Conditions + onClick={() => elementActions.fetchElements('conditions')}>{gettext('Conditions')} elementActions.fetchElements('tasks')}>Tasks + onClick={() => elementActions.fetchElements('tasks')}>{gettext('Tasks')} elementActions.fetchElements('views')}>Views + onClick={() => elementActions.fetchElements('views')}>{gettext('Views')}