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.

Sign up for GitHub

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

Fix i18n related issues #826

Merged
merged 2 commits into from
Nov 24, 2023
Merged

Fix i18n related issues #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42e08cf
Add missing gettext calls to sidebar in management interface
jochenklar Nov 16, 2023
2c6c487
Remove interpolation from MultiSelect, OrderedMultiSelect, and Select…
jochenklar Nov 16, 2023
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
4 changes: 2 additions & 2 deletions rdmo/management/assets/js/components/edit/EditCatalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ const EditCatalog = ({ config, catalog, elements, elementActions }) => {
}
</Tabs>

<OrderedMultiSelect config={config} element={catalog} field="sections"
options={sections} verboseName="section"
<OrderedMultiSelect config={config} element={catalog} field="sections" options={sections}
addText={gettext('Add existing section')} createText={gettext('Create new section')}
onChange={updateCatalog} onCreate={createSection} onEdit={editSection} />

{get(config, 'settings.groups') && <Select config={config} element={catalog} field="groups"
Expand Down
2 changes: 1 addition & 1 deletion rdmo/management/assets/js/components/edit/EditCondition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const EditCondition = ({ config, condition, elements, elementActions }) => {
<Checkbox config={config} element={condition} field="locked"
onChange={updateCondition} />

<Select config={config} element={condition} field="source" verboseName={gettext('attribute')}
<Select config={config} element={condition} field="source" createText={gettext('Create new attribute')}
options={attributes} onChange={updateCondition} onCreate={createAttribute} onEdit={editAttribute} />

<Select config={config} element={condition} field="relation"
Expand Down
8 changes: 4 additions & 4 deletions rdmo/management/assets/js/components/edit/EditOptionSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ const EditOptionSet = ({ config, optionset, elements, elementActions }) => {
</div>
</div>

<OrderedMultiSelect config={config} element={optionset} field="options"
options={options} verboseName="option"
<OrderedMultiSelect config={config} element={optionset} field="options" options={options}
addText={gettext('Add existing option')} createText={gettext('Create new option')}
onChange={updateOptionSet} onCreate={createOption} onEdit={editOption} />

<MultiSelect config={config} element={optionset} field="conditions"
options={conditions} verboseName="condition"
<MultiSelect config={config} element={optionset} field="conditions" options={conditions}
addText={gettext('Add existing condition')} createText={gettext('Create new condition')}
onChange={updateOptionSet} onCreate={createCondition} onEdit={editCondition} />

<Select config={config} element={optionset} field="provider_key"
Expand Down
11 changes: 6 additions & 5 deletions rdmo/management/assets/js/components/edit/EditPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,18 @@ const EditPage = ({ config, page, elements, elementActions }) => {
}
</Tabs>

<Select config={config} element={page} field="attribute" verboseName={gettext('attribute')}
<Select config={config} element={page} field="attribute" createText={gettext('Create new attribute')}
options={attributes} onChange={updatePage} onCreate={createAttribute} onEdit={editAttribute} />

<OrderedMultiSelect config={config} element={page} field="elements"
values={elementValues} options={elementOptions} verboseName={gettext('element')}
verboseNameCreate={gettext('question')} verboseNameAltCreate={gettext('question set')}
values={elementValues} options={elementOptions}
addText={gettext('Add existing element')} createText={gettext('Create new question')}
altCreateText={gettext('Create new question set')}
onChange={updatePage} onCreate={createQuestion} onAltCreate={createQuestionSet}
onEdit={editElement} />

<MultiSelect config={config} element={page} field="conditions"
options={conditions} verboseName="condition"
<MultiSelect config={config} element={page} field="conditions" options={conditions}
addText={gettext('Add existing condition')} createText={gettext('Create new condition')}
onChange={updatePage} onCreate={createCondition} onEdit={editCondition} />

{get(config, 'settings.multisite') && <Select config={config} element={page} field="editors"
Expand Down
10 changes: 5 additions & 5 deletions rdmo/management/assets/js/components/edit/EditQuestion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const EditQuestion = ({ config, question, elements, elementActions}) => {
}
</Tabs>

<Select config={config} element={question} field="attribute" verboseName={gettext('attribute')}
<Select config={config} element={question} field="attribute" createText={gettext('Create new attribute')}
options={attributes} onChange={updateQuestion} onCreate={createAttribute} onEdit={editAttribute} />

<div className="row">
Expand All @@ -159,13 +159,13 @@ const EditQuestion = ({ config, question, elements, elementActions}) => {

<Tabs id="#question-tabs2" defaultActiveKey={0} animation={false}>
<Tab key={0} eventKey={0} title={gettext('Conditions')}>
<MultiSelect config={config} element={question} field="conditions"
options={conditions} verboseName="condition"
<MultiSelect config={config} element={question} field="conditions" options={conditions}
addText={gettext('Add existing condition')} createText={gettext('Create new condition')}
onChange={updateQuestion} onCreate={createCondition} onEdit={editCondition} />
</Tab>
<Tab key={1} eventKey={1} title={gettext('Option sets')}>
<MultiSelect config={config} element={question} field="optionsets"
options={optionsets} verboseName="optionset"
<MultiSelect config={config} element={question} field="optionsets" options={optionsets}
addText={gettext('Add existing optionset')} createText={gettext('Create new optionset')}
onChange={updateQuestion} onCreate={createOptionSet} onEdit={editOptionSet} />
</Tab>
<Tab key={2} eventKey={2} title={gettext('Range')}>
Expand Down
11 changes: 6 additions & 5 deletions rdmo/management/assets/js/components/edit/EditQuestionSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,18 @@ const EditQuestionSet = ({ config, questionset, elements, elementActions }) => {
}
</Tabs>

<Select config={config} element={questionset} field="attribute" verboseName={gettext('attribute')}
<Select config={config} element={questionset} field="attribute" createText={gettext('Create new attribute')}
options={attributes} onChange={updateQuestionSet} onCreate={createAttribute} onEdit={editAttribute} />

<OrderedMultiSelect config={config} element={questionset} field="elements"
values={elementValues} options={elementOptions} verboseName={gettext('element')}
verboseNameCreate={gettext('question')} verboseNameAltCreate={gettext('question set')}
values={elementValues} options={elementOptions}
addText={gettext('Add existing element')} createText={gettext('Create new question')}
altCreateText={gettext('Create new question set')}
onChange={updateQuestionSet} onCreate={createQuestion} onAltCreate={createQuestionSet}
onEdit={editElement}/>

<MultiSelect config={config} element={questionset} field="conditions"
options={conditions} verboseName="condition"
<MultiSelect config={config} element={questionset} field="conditions" options={conditions}
addText={gettext('Add existing condition')} createText={gettext('Create new condition')}
onChange={updateQuestionSet} onCreate={createCondition} onEdit={editCondition} />

{get(config, 'settings.multisite') && <Select config={config} element={questionset} field="editors"
Expand Down
4 changes: 2 additions & 2 deletions rdmo/management/assets/js/components/edit/EditSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ const EditSection = ({ config, section, elements, elementActions }) => {
}
</Tabs>

<OrderedMultiSelect config={config} element={section} field="pages"
options={pages} verboseName="page"
<OrderedMultiSelect config={config} element={section} field="pages" options={pages}
addText={gettext('Add existing page')} createText={gettext('Create new page')}
onChange={updateSection} onCreate={createPage} onEdit={editPage} />

{get(config, 'settings.multisite') && <Select config={config} element={section} field="editors"
Expand Down
4 changes: 2 additions & 2 deletions rdmo/management/assets/js/components/edit/EditTask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ const EditTask = ({ config, task, elements, elementActions}) => {
}
</Tabs>

<MultiSelect config={config} element={task} field="conditions"
options={conditions} verboseName="condition"
<MultiSelect config={config} element={task} field="conditions" options={conditions}
addText={gettext('Add existing condition')} createText={gettext('Create new condition')}
onChange={updateTask} onCreate={createCondition} onEdit={editCondition} />

<Select config={config} element={task} field="start_attribute"
Expand Down
9 changes: 5 additions & 4 deletions rdmo/management/assets/js/components/edit/common/MultiSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Link from 'rdmo/core/assets/js/components/Link'

import { getId, getLabel, getHelp } from 'rdmo/management/assets/js/utils/forms'

const MultiSelect = ({ config, element, field, options, verboseName, onChange, onCreate, onEdit }) => {
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),
Expand Down Expand Up @@ -82,15 +82,15 @@ const MultiSelect = ({ config, element, field, options, verboseName, onChange, o
</div>

<button className="btn btn-primary btn-xs" onClick={() => handleAdd()} disabled={element.read_only}>
{interpolate(gettext('Add %s'), [verboseName])}
{addText}
</button>

{
onCreate &&
<button className="btn btn-success btn-xs ml-10" onClick={onCreate}
disabled={element.read_only || isNil(element.id)}
title={isNil(element.id) ? gettext('For this action, the element must first be created.') : undefined}>
{interpolate(gettext('Create new %s'), [verboseName])}
{createText}
</button>
}

Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions rdmo/management/assets/js/components/edit/common/OrderedMultiSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -239,22 +239,22 @@ class OrderedMultiSelect extends Component {

<button className="btn btn-primary btn-xs" onClick={() => this.handleAdd()}
disabled={element.read_only}>
{interpolate(gettext('Add existing %s'), [verboseName])}
{addText}
</button>
{
onCreate &&
<button className="btn btn-success btn-xs ml-10" onClick={onCreate}
disabled={element.read_only || isNil(element.id)}
title={isNil(element.id) ? gettext('For this action, the element must first be created.') : undefined}>
{interpolate(gettext('Create new %s'), [verboseNameCreate || verboseName])}
{createText}
</button>
}
{
onAltCreate &&
<button className="btn btn-success btn-xs ml-10" onClick={onAltCreate}
disabled={element.read_only || isNil(element.id)}
title={isNil(element.id) ? gettext('For this action, the element must first be created.') : undefined}>
{interpolate(gettext('Create new %s'), [verboseNameAltCreate || verboseName])}
{altCreateText}
</button>
}

Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions rdmo/management/assets/js/components/edit/common/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -68,7 +68,7 @@ const Select = ({ config, element, field, options, verboseName, isMulti, onChang
onCreate &&
<button className="btn btn-success btn-xs mt-10" onClick={onCreate} disabled={isNil(element.id)}
title={isNil(element.id) ? gettext('For this action, the element must first be created.') : undefined}>
{interpolate(gettext('Create new %s'), [verboseName])}
{createText}
</button>
}

Expand All @@ -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,
Expand Down
22 changes: 11 additions & 11 deletions rdmo/management/assets/js/components/sidebar/ElementsSidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,47 +27,47 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) =>
<ul className="list-unstyled">
<li>
<Link href={buildPath(config.baseUrl, 'catalogs')}
onClick={() => elementActions.fetchElements('catalogs')}>Catalogs</Link>
onClick={() => elementActions.fetchElements('catalogs')}>{gettext('Catalogs')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'sections')}
onClick={() => elementActions.fetchElements('sections')}>Sections</Link>
onClick={() => elementActions.fetchElements('sections')}>{gettext('Sections')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'pages')}
onClick={() => elementActions.fetchElements('pages')}>Pages</Link>
onClick={() => elementActions.fetchElements('pages')}>{gettext('Pages')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'questionsets')}
onClick={() => elementActions.fetchElements('questionsets')}>Question sets</Link>
onClick={() => elementActions.fetchElements('questionsets')}>{gettext('Question sets')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'questions')}
onClick={() => elementActions.fetchElements('questions')}>Questions</Link>
onClick={() => elementActions.fetchElements('questions')}>{gettext('Questions')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'attributes')}
onClick={() => elementActions.fetchElements('attributes')}>Attributes</Link>
onClick={() => elementActions.fetchElements('attributes')}>{gettext('Attributes')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'optionsets')}
onClick={() => elementActions.fetchElements('optionsets')}>Option sets</Link>
onClick={() => elementActions.fetchElements('optionsets')}>{gettext('Option sets')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'options')}
onClick={() => elementActions.fetchElements('options')}>Options</Link>
onClick={() => elementActions.fetchElements('options')}>{gettext('Options')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'conditions')}
onClick={() => elementActions.fetchElements('conditions')}>Conditions</Link>
onClick={() => elementActions.fetchElements('conditions')}>{gettext('Conditions')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'tasks')}
onClick={() => elementActions.fetchElements('tasks')}>Tasks</Link>
onClick={() => elementActions.fetchElements('tasks')}>{gettext('Tasks')}</Link>
</li>
<li>
<Link href={buildPath(config.baseUrl, 'views')}
onClick={() => elementActions.fetchElements('views')}>Views</Link>
onClick={() => elementActions.fetchElements('views')}>{gettext('Views')}</Link>
</li>
</ul>

Expand Down