Skip to content
Open
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
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ locales:
msgfmt -o modules/dictionary/locale/hi/LC_MESSAGES/dictionary.mo modules/dictionary/locale/hi/LC_MESSAGES/dictionary.po
npx i18next-conv -l hi -s modules/dictionary/locale/hi/LC_MESSAGES/dictionary.po -t modules/dictionary/locale/hi/LC_MESSAGES/dictionary.json
msgfmt -o modules/document_repository/locale/ja/LC_MESSAGES/document_repository.mo modules/document_repository/locale/ja/LC_MESSAGES/document_repository.po
msgfmt -o modules/document_repository/locale/hi/LC_MESSAGES/document_repository.mo modules/document_repository/locale/hi/LC_MESSAGES/document_repository.po
npx i18next-conv -l hi -s modules/document_repository/locale/hi/LC_MESSAGES/document_repository.po -t modules/document_repository/locale/hi/LC_MESSAGES/document_repository.json
msgfmt -o modules/dqt/locale/ja/LC_MESSAGES/dqt.mo modules/dqt/locale/ja/LC_MESSAGES/dqt.po
msgfmt -o modules/electrophysiology_browser/locale/ja/LC_MESSAGES/electrophysiology_browser.mo modules/electrophysiology_browser/locale/ja/LC_MESSAGES/electrophysiology_browser.po
msgfmt -o modules/electrophysiology_uploader/locale/ja/LC_MESSAGES/electrophysiology_uploader.mo modules/electrophysiology_uploader/locale/ja/LC_MESSAGES/electrophysiology_uploader.po
Expand Down
32 changes: 23 additions & 9 deletions modules/document_repository/jsx/categoryForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import {
SelectElement,
ButtonElement,
} from 'jsx/Form';
import i18n from 'I18nSetup';
import {withTranslation} from 'react-i18next';
import hiStrings from '../locale/hi/LC_MESSAGES/document_repository.json';

/**
* Category Creation Form
Expand Down Expand Up @@ -68,9 +71,11 @@ class DocCategoryForm extends React.Component {
* @return {JSX} - React markup for the component
*/
render() {
const {t} = this.props;
// Data loading error
if (this.state.error) {
return <h3>An error occured while loading the page.</h3>;
return <h3>{t('An error occured while loading the page.',
{ns: 'document_repository'})}</h3>;
}
// Waiting for data to load
if (!this.state.isLoaded) {
Expand All @@ -81,7 +86,8 @@ class DocCategoryForm extends React.Component {
let addButton = null;
if (loris.userHasPermission('document_repository_categories')) {
disabled = false;
addButton = <ButtonElement label="Add Category"/>;
addButton = <ButtonElement label={t('Add Category',
{ns: 'document_repository'})}/>;
}

return (
Expand All @@ -92,26 +98,28 @@ class DocCategoryForm extends React.Component {
fileUpload={true}
onSubmit={this.handleSubmit}
>
<h3>Add a category</h3><br/>
<h3>{t('Add a category',
{ns: 'document_repository'})}</h3><br/>
<TextboxElement
name="categoryName"
label="Category Name"
label={t('Category Name',
{ns: 'document_repository'})}
onUserInput={this.setFormData}
required={true}
disabled={disabled}
value={this.state.formData.categoryName}
/>
<SelectElement
name="parentId"
label="Parent"
label={t('Parent', {ns: 'document_repository'})}
options={this.state.data.fieldOptions.fileCategories}
onUserInput={this.setFormData}
disabled={disabled}
value={this.state.formData.parentId}
/>
<TextareaElement
name="comments"
label="Comments"
label={t('Comments', {ns: 'document_repository'})}
onUserInput={this.setFormData}
disabled={disabled}
value={this.state.formData.comments}
Expand Down Expand Up @@ -167,10 +175,12 @@ class DocCategoryForm extends React.Component {
this.setState({
formData: {}, // reset form data after successful file upload
});
swal.fire('Category Successfully Added!', '', 'success');
swal.fire('Category Successfully Added!',
'', 'success');
} else {
resp.json().then((data) => {
swal.fire('Could not add category!', data.error, 'error');
swal.fire('Could not add category!',
data.error, 'error');
}).catch((error) => {
console.error(error);
swal.fire(
Expand Down Expand Up @@ -202,6 +212,10 @@ DocCategoryForm.propTypes = {
action: PropTypes.string.isRequired,
refreshPage: PropTypes.func,
newCategoryState: PropTypes.func,
t: PropTypes.func,
};

export default DocCategoryForm;
i18n.addResourceBundle('hi', 'document_repository', hiStrings);

export default withTranslation(
['document_repository', 'loris'])(DocCategoryForm);
28 changes: 20 additions & 8 deletions modules/document_repository/jsx/deleteCategoryForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import {
ButtonElement,
SelectElement,
} from 'jsx/Form';
import {withTranslation} from 'react-i18next';
import i18n from 'I18nSetup';
import hiStrings from '../locale/hi/LC_MESSAGES/document_repository.json';

/**
* Document Delete category Form
Expand Down Expand Up @@ -65,9 +68,11 @@ class DeleteDocCategoryForm extends React.Component {
* @return {JSX} - React markup for the component
*/
render() {
const {t} = this.props;
// Data loading error
if (this.state.error) {
return <h3>An error occured while loading the page.</h3>;
return <h3>{t('An error occured while loading the page.',
{ns: 'loris'})}</h3>;
}
// Waiting for data to load
if (!this.state.isLoaded) {
Expand All @@ -78,7 +83,8 @@ class DeleteDocCategoryForm extends React.Component {
let deleteButton = null;
if (loris.userHasPermission('document_repository_categories')) {
disabled = false;
deleteButton = <ButtonElement label="Delete Category"/>;
deleteButton = <ButtonElement label={t('Delete Category',
{ns: 'document_repository'})}/>;
}

return (
Expand All @@ -88,10 +94,10 @@ class DeleteDocCategoryForm extends React.Component {
name="categoryEdit"
onSubmit={this.handleSubmit}
>
<h3>Delete a category</h3><br/>
<h3>{t('Delete a category', {ns: 'document_repository'})}</h3><br/>
<SelectElement
name="categoryID"
label="Category Name:"
label={t('Category Name:', {ns: 'document_repository'})}
options={this.state.data.fieldOptions.fileCategories}
onUserInput={this.setFormData}
required={true}
Expand Down Expand Up @@ -126,6 +132,7 @@ class DeleteDocCategoryForm extends React.Component {
* Delete the Category.
*/
deleteCategory() {
const {t} = this.props;
let formData = this.state.formData;
let formObj = new FormData();
for (let key in formData) {
Expand All @@ -147,7 +154,7 @@ class DeleteDocCategoryForm extends React.Component {
} else if (response.statusText) {
msg = response.statusText;
} else {
msg = 'Delete error!';
msg = t('Delete error!', {ns: 'document_repository'});
}
this.setState({
errorMessage: msg,
Expand All @@ -156,15 +163,16 @@ class DeleteDocCategoryForm extends React.Component {
console.error(msg);
} else {
swal.fire({
text: 'Delete Successful!',
text: t('Delete Successful!', {ns: 'document_repository'}),
title: '',
type: 'success',
}).then(function() {
window.location.assign('/document_repository');
});
}
}).catch( (error) => {
let msg = error.message ? error.message : 'Delete error!';
let msg = error.message ? error.message : t('Delete error!',
{ns: 'document_repository'});
this.setState({
errorMessage: msg,
uploadProgress: -1,
Expand All @@ -190,6 +198,10 @@ class DeleteDocCategoryForm extends React.Component {
DeleteDocCategoryForm.propTypes = {
dataURL: PropTypes.string.isRequired,
action: PropTypes.string.isRequired,
t: PropTypes.func,
};

export default DeleteDocCategoryForm;
i18n.addResourceBundle('hi', 'document_repository', hiStrings);

export default withTranslation(
['document_repository', 'loris'])(DeleteDocCategoryForm);
Loading
Loading