Merge branch 'main' into TranslateDataquery

Author: jeffersoncasimir

Makefile

@@ -104,6 +104,8 @@ locales:
 	msgfmt -o modules/configuration/locale/ja/LC_MESSAGES/configuration.mo modules/configuration/locale/ja/LC_MESSAGES/configuration.po
 	msgfmt -o modules/configuration/locale/ja/LC_MESSAGES/configuration.mo modules/configuration/locale/ja/LC_MESSAGES/configuration.po
 	msgfmt -o modules/conflict_resolver/locale/ja/LC_MESSAGES/conflict_resolver.mo modules/conflict_resolver/locale/ja/LC_MESSAGES/conflict_resolver.po
+	msgfmt -o modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.mo modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.po
+	npx i18next-conv -l hi -s modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.po -t modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.json
 	npx i18next-conv -l ja -s modules/conflict_resolver/locale/ja/LC_MESSAGES/conflict_resolver.po -t modules/conflict_resolver/locale/ja/LC_MESSAGES/conflict_resolver.json
 	msgfmt -o modules/create_timepoint/locale/ja/LC_MESSAGES/create_timepoint.mo modules/create_timepoint/locale/ja/LC_MESSAGES/create_timepoint.po
 	npx i18next-conv -l ja -s modules/create_timepoint/locale/ja/LC_MESSAGES/create_timepoint.po -t modules/create_timepoint/locale/ja/LC_MESSAGES/create_timepoint.json
@@ -122,6 +124,8 @@ locales:
 	msgfmt -o modules/data_release/locale/hi/LC_MESSAGES/data_release.mo modules/data_release/locale/hi/LC_MESSAGES/data_release.po
 	npx i18next-conv -l hi -s modules/data_release/locale/hi/LC_MESSAGES/data_release.po -t modules/data_release/locale/hi/LC_MESSAGES/data_release.json
 	msgfmt -o modules/dicom_archive/locale/ja/LC_MESSAGES/dicom_archive.mo modules/dicom_archive/locale/ja/LC_MESSAGES/dicom_archive.po
+	msgfmt -o modules/dicom_archive/locale/hi/LC_MESSAGES/dicom_archive.mo modules/dicom_archive/locale/hi/LC_MESSAGES/dicom_archive.po
+	npx i18next-conv -l hi -s modules/dicom_archive/locale/hi/LC_MESSAGES/dicom_archive.po -t modules/dicom_archive/locale/hi/LC_MESSAGES/dicom_archive.json
 	msgfmt -o modules/dictionary/locale/ja/LC_MESSAGES/dictionary.mo modules/dictionary/locale/ja/LC_MESSAGES/dictionary.po
 	npx i18next-conv -l ja -s modules/dictionary/locale/ja/LC_MESSAGES/dictionary.po -t modules/dictionary/locale/ja/LC_MESSAGES/dictionary.json
 	msgfmt -o modules/dictionary/locale/hi/LC_MESSAGES/dictionary.mo modules/dictionary/locale/hi/LC_MESSAGES/dictionary.po
@@ -135,11 +139,14 @@ locales:
 	msgfmt -o modules/help_editor/locale/ja/LC_MESSAGES/help_editor.mo modules/help_editor/locale/ja/LC_MESSAGES/help_editor.po
 	msgfmt -o modules/help_editor/locale/hi/LC_MESSAGES/help_editor.mo modules/help_editor/locale/hi/LC_MESSAGES/help_editor.po
 	npx i18next-conv -l hi -s modules/help_editor/locale/hi/LC_MESSAGES/help_editor.po -t modules/help_editor/locale/hi/LC_MESSAGES/help_editor.json
+	npx i18next-conv -l ja -s modules/help_editor/locale/ja/LC_MESSAGES/help_editor.po -t modules/help_editor/locale/ja/LC_MESSAGES/help_editor.json
 	msgfmt -o modules/imaging_browser/locale/ja/LC_MESSAGES/imaging_browser.mo modules/imaging_browser/locale/ja/LC_MESSAGES/imaging_browser.po
 	npx i18next-conv -l ja -s modules/imaging_browser/locale/ja/LC_MESSAGES/imaging_browser.po -t modules/imaging_browser/locale/ja/LC_MESSAGES/imaging_browser.json --compatibilityJSON v4
 	msgfmt -o modules/imaging_qc/locale/ja/LC_MESSAGES/imaging_qc.mo modules/imaging_qc/locale/ja/LC_MESSAGES/imaging_qc.po
 	msgfmt -o modules/imaging_uploader/locale/ja/LC_MESSAGES/imaging_uploader.mo modules/imaging_uploader/locale/ja/LC_MESSAGES/imaging_uploader.po
 	msgfmt -o modules/instrument_builder/locale/ja/LC_MESSAGES/instrument_builder.mo modules/instrument_builder/locale/ja/LC_MESSAGES/instrument_builder.po
+	msgfmt -o modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.mo modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.po
+	npx i18next-conv -l hi -s modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.po -t modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.json --compatibilityJSON v4
 	msgfmt -o modules/instrument_list/locale/ja/LC_MESSAGES/instrument_list.mo modules/instrument_list/locale/ja/LC_MESSAGES/instrument_list.po
 	msgfmt -o modules/instrument_list/locale/es/LC_MESSAGES/instrument_list.mo modules/instrument_list/locale/es/LC_MESSAGES/instrument_list.po
 	msgfmt -o modules/instrument_list/locale/fr/LC_MESSAGES/instrument_list.mo modules/instrument_list/locale/fr/LC_MESSAGES/instrument_list.po
@@ -148,10 +155,14 @@ locales:
 	npx i18next-conv -l ja -s modules/instruments/locale/ja/LC_MESSAGES/instruments.po -t modules/instruments/locale/ja/LC_MESSAGES/instruments.json --compatibilityJSON v4
 	msgfmt -o modules/instruments/locale/es/LC_MESSAGES/instruments.mo modules/instruments/locale/es/LC_MESSAGES/instruments.po
 	msgfmt -o modules/issue_tracker/locale/ja/LC_MESSAGES/issue_tracker.mo modules/issue_tracker/locale/ja/LC_MESSAGES/issue_tracker.po
+	msgfmt -o modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.mo modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.po
+	npx i18next-conv -l hi -s modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.po -t modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.json --compatibilityJSON v4
 	npx i18next-conv -l ja -s modules/issue_tracker/locale/ja/LC_MESSAGES/issue_tracker.po -t modules/issue_tracker/locale/ja/LC_MESSAGES/issue_tracker.json --compatibilityJSON v4
 	msgfmt -o modules/login/locale/ja/LC_MESSAGES/login.mo modules/login/locale/ja/LC_MESSAGES/login.po
 	msgfmt -o modules/media/locale/ja/LC_MESSAGES/media.mo modules/media/locale/ja/LC_MESSAGES/media.po
 	msgfmt -o modules/module_manager/locale/ja/LC_MESSAGES/module_manager.mo modules/module_manager/locale/ja/LC_MESSAGES/module_manager.po
+	msgfmt -o modules/module_manager/locale/hi/LC_MESSAGES/module_manager.mo modules/module_manager/locale/hi/LC_MESSAGES/module_manager.po
+	npx i18next-conv -l hi -s modules/module_manager/locale/hi/LC_MESSAGES/module_manager.po -t modules/module_manager/locale/hi/LC_MESSAGES/module_manager.json
 	msgfmt -o modules/mri_violations/locale/ja/LC_MESSAGES/mri_violations.mo modules/mri_violations/locale/ja/LC_MESSAGES/mri_violations.po
 	msgfmt -o modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.mo modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.po
 	npx i18next-conv -l ja -s modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.json --compatibilityJSON v4
@@ -161,7 +172,11 @@ locales:
 	msgfmt -o modules/next_stage/locale/es/LC_MESSAGES/next_stage.mo modules/next_stage/locale/es/LC_MESSAGES/next_stage.po
 	msgfmt -o modules/oidc/locale/ja/LC_MESSAGES/oidc.mo modules/oidc/locale/ja/LC_MESSAGES/oidc.po
 	msgfmt -o modules/publication/locale/ja/LC_MESSAGES/publication.mo modules/publication/locale/ja/LC_MESSAGES/publication.po
+	msgfmt -o modules/publication/locale/hi/LC_MESSAGES/publication.mo modules/publication/locale/hi/LC_MESSAGES/publication.po
+	npx i18next-conv -l hi -s modules/publication/locale/hi/LC_MESSAGES/publication.po -t modules/publication/locale/hi/LC_MESSAGES/publication.json
 	msgfmt -o modules/schedule_module/locale/ja/LC_MESSAGES/schedule_module.mo modules/schedule_module/locale/ja/LC_MESSAGES/schedule_module.po
+	msgfmt -o modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.mo modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.po
+	npx i18next-conv -l hi -s modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.po -t modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.json	
 	msgfmt -o modules/server_processes_manager/locale/ja/LC_MESSAGES/server_processes_manager.mo modules/server_processes_manager/locale/ja/LC_MESSAGES/server_processes_manager.po
 	msgfmt -o modules/statistics/locale/ja/LC_MESSAGES/statistics.mo modules/statistics/locale/ja/LC_MESSAGES/statistics.po
 	npx i18next-conv -l ja -s modules/statistics/locale/ja/LC_MESSAGES/statistics.po -t modules/statistics/locale/ja/LC_MESSAGES/statistics.json
@@ -181,8 +196,8 @@ create_timepoint:
 	target=data_release npm run compile
 
 data_release: modules/data_release/locale/hi/LC_MESSAGES/data_release.mo modules/data_release/locale/ja/LC_MESSAGES/data_release.mo
-	npx i18next-conv -l hi -s modules/data_release/locale/hi/LC_MESSAGES/data_release.po -t modules/data_release/locale/hi/LC_MESSAGES/data_release.json 
-	npx i18next-conv -l ja -s modules/data_release/locale/ja/LC_MESSAGES/data_release.po -t modules/data_release/locale/ja/LC_MESSAGES/data_release.json 
+	npx i18next-conv -l hi -s modules/data_release/locale/hi/LC_MESSAGES/data_release.po -t modules/data_release/locale/hi/LC_MESSAGES/data_release.json
+	npx i18next-conv -l ja -s modules/data_release/locale/ja/LC_MESSAGES/data_release.po -t modules/data_release/locale/ja/LC_MESSAGES/data_release.json
 	target=data_release npm run compile
 
 instrument_manager: modules/instrument_manager/locale/ja/LC_MESSAGES/instrument_manager.mo
@@ -191,18 +206,23 @@ instrument_manager: modules/instrument_manager/locale/ja/LC_MESSAGES/instrument_
 dataquery:
 	msgfmt -o modules/dataquery/locale/hi/LC_MESSAGES/dataquery.mo modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
 	npx i18next-conv -l hi -s modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po -t modules/dataquery/locale/hi/LC_MESSAGES/dataquery.json
-	target=dataquery npm run compile
+
+instrument_builder: modules/instrument_builder/locale/ja/LC_MESSAGES/instrument_builder.mo modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.mo
+	npx i18next-conv -l hi -s modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.po -t modules/instrument_builder/locale/hi/LC_MESSAGES/instrument_builder.json --compatibilityJSON v4
+	target=instrument_builder npm run compile
 
 login: modules/login/locale/ja/LC_MESSAGES/login.mo
 	target=login npm run compile
 
-module_manager: modules/module_manager/locale/ja/LC_MESSAGES/module_manager.mo
+module_manager: modules/module_manager/locale/ja/LC_MESSAGES/module_manager.mo modules/module_manager/locale/hi/LC_MESSAGES/module_manager.mo
 	target=module_manager npm run compile
 
 mri_violations: modules/mri_violations/locale/ja/LC_MESSAGES/mri_violations.mo
 	target=mri_violations npm run compile
 
-issue_tracker: modules/issue_tracker/locale/ja/LC_MESSAGES/issue_tracker.mo
+issue_tracker:
+	msgfmt -o modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.mo modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.po
+	npx i18next-conv -l hi -s modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.po -t modules/issue_tracker/locale/hi/LC_MESSAGES/issue_tracker.json
 	target=issue_tracker npm run compile
 
 candidate_list: modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.mo modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.mo
@@ -217,19 +237,30 @@ candidate_parameters: modules/candidate_parameters/locale/ja/LC_MESSAGES/candida
 dashboard: modules/dashboard/locale/ja/LC_MESSAGES/dashboard.mo
 	target=dashboard npm run compile
 
-publication: modules/publication/locale/ja/LC_MESSAGES/publication.mo
+publication:
+	msgfmt -o modules/publication/locale/hi/LC_MESSAGES/publication.mo modules/publication/locale/hi/LC_MESSAGES/publication.po
+	npx i18next-conv -l hi -s modules/publication/locale/hi/LC_MESSAGES/publication.po -t modules/publication/locale/hi/LC_MESSAGES/publication.json
 	target=publication npm run compile
 
+schedule_module:
+	msgfmt -o modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.mo modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.po
+	npx i18next-conv -l hi -s modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.po -t modules/schedule_module/locale/hi/LC_MESSAGES/schedule_module.json
+	target=schedule_module npm run compile
+
 server_processes_manager: modules/server_processes_manager/locale/ja/LC_MESSAGES/server_processes_manager.mo
 	target=server_processes_manager npm run compile
 
 conflict_resolver:
+	msgfmt -o modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.mo modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.po
+	npx i18next-conv -l hi -s modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.po -t modules/conflict_resolver/locale/hi/LC_MESSAGES/conflict_resolver.json
+	npx i18next-conv -l ja -s modules/conflict_resolver/locale/ja/LC_MESSAGES/conflict_resolver.po -t modules/conflict_resolver/locale/ja/LC_MESSAGES/conflict_resolver.json
 	target=conflict_resolver npm run compile
 
 behavioural_qc:
 	msgfmt -o modules/behavioural_qc/locale/hi/LC_MESSAGES/behavioural_qc.mo modules/behavioural_qc/locale/hi/LC_MESSAGES/behavioural_qc.po
 	npx i18next-conv -l hi -s modules/behavioural_qc/locale/hi/LC_MESSAGES/behavioural_qc.po -t modules/behavioural_qc/locale/hi/LC_MESSAGES/behavioural_qc.json
 	target=behavioural_qc npm run compile
+
 my_preferences: modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.mo modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.mo
 	npx i18next-conv -l ja -s modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.json --compatibilityJSON v4
 	npx i18next-conv -l hi -s modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.json --compatibilityJSON v4

jsx/Filter.js

@@ -146,7 +146,7 @@ function Filter(props) {
             data-toggle='dropdown'
             role='button'
           >
-            Load Filter Preset <span className='caret'/>
+            {props.t('Load Filter Preset')} <span className='caret'/>
           </a>
           <ul className='dropdown-menu' role='menu'>
             {presets}

locale/hi/LC_MESSAGES/loris.po

@@ -152,6 +152,9 @@ msgstr "बनाएँ"
 msgid "Selection Filter"
 msgstr "चयन फ़िल्टर"
 
+msgid "Filters"
+msgstr "फ़िल्टर"
+
 msgid "Show Filters"
 msgstr "फ़िल्टर दिखाएँ"
 
@@ -161,6 +164,9 @@ msgstr "फ़िल्टर छिपाएँ"
 msgid "Clear Filters"
 msgstr "फ़िल्टर साफ़ करें"
 
+msgid "Load Filter Preset"
+msgstr "फ़िल्टर प्रीसेट लोड करें"
+
 msgid "Show Advanced Filters"
 msgstr "उन्नत फ़िल्टर दिखाएँ"
 
@@ -205,6 +211,12 @@ msgstr "डीसीसीआईडी"
 msgid "Visit Label"
 msgstr "दौरे का लेबल"
 
+msgid "Status"
+msgstr "स्थिति"
+
+msgid "No."
+msgstr "संख्या"
+
 msgid "Email"
 msgstr "ईमेल"
 
@@ -383,6 +395,9 @@ msgstr "कुल"
 msgid "Error!"
 msgstr "त्रुटि!"
 
+msgid "Date"
+msgstr "दिनांक"
+
 # Common timepoint and visit terms
 msgid "Not Started"
 msgstr "शुरू नहीं हुआ"
@@ -456,3 +471,6 @@ msgstr "{{years}} वर्ष का"
 # Other generic terms
 msgid "Loading..."
 msgstr "लोड हो रहा है..."
+
+msgid "Permission denied"
+msgstr "अनुमति अस्वीकृत"

locale/ja/LC_MESSAGES/loris.po

@@ -155,6 +155,9 @@ msgstr "取り消す"
 msgid "Success!"
 msgstr "成功！"
 
+msgid "Close"
+msgstr "近い"
+
 # Common candidate terms
 msgid "PSCID"
 msgstr "プロジェクト識別子"

locale/loris.pot

@@ -57,6 +57,7 @@ msgstr ""
 #: modules/user_accounts/php/module.class.inc:53
 msgid "Admin"
 msgstr ""
+
 #: modules/acknowledgements/php/module.class.inc:54
 #: modules/api_docs/php/module.class.inc:66
 #: modules/battery_manager/php/module.class.inc:55
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Reports"
 msgstr ""
 
-# Common loris terms. Consider moving these to their own textdomain?
+# Common loris terms.
 msgid "TimePoint"
 msgstr ""
 
@@ -170,13 +171,19 @@ msgid "Leaving the form will result in the loss of any information entered."
 msgid "Close"
 msgstr ""
 
+msgid "Close"
+msgstr ""
+
 # Common candidate terms
 msgid "PSCID"
 msgstr ""
 
 msgid "DCCID"
 msgstr ""
 
+msgid "Visit"
+msgstr ""
+
 msgid "Visit Label"
 msgstr ""
 
@@ -203,7 +210,7 @@ msgstr ""
 msgid "Cohort"
 msgid_plural "Cohorts"
 msgstr[0] ""
- 
+
 msgid "Session"
 msgstr ""
 
@@ -228,6 +235,12 @@ msgstr ""
 msgid "Scans"
 msgstr ""
 
+msgid "Date"
+msgstr ""
+
+msgid "Time"
+msgstr ""
+
 msgid "Stage"
 msgstr ""
 
@@ -371,9 +384,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 # Common timepoint and vist terms
 msgid "Not Started"
 msgstr ""
@@ -453,3 +463,5 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
+msgid "Permission denied"
+msgstr ""

modules/conflict_resolver/jsx/conflict_resolver.js

@@ -3,9 +3,11 @@ import React, {Component} from 'react';
 import {Tabs, TabPane} from 'Tabs';
 import i18n from 'I18nSetup';
 import {withTranslation} from 'react-i18next';
+import PropTypes from 'prop-types';
 
 import UnresolvedFilterableDataTable from './unresolved_filterabledatatable';
 import ResolvedFilterableDataTable from './resolved_filterabledatatable';
+import hiStrings from '../locale/hi/LC_MESSAGES/conflict_resolver.json';
 
 /**
  * Conflict Resolver class.
@@ -41,9 +43,10 @@ class ConflictResolver extends Component {
    * @return {JSX}
    */
   render() {
+    const {t} = this.props;
     const tabs = [
-      {id: 'unresolved', label: 'Unresolved'},
-      {id: 'resolved', label: 'Resolved'},
+      {id: 'unresolved', label: t('Unresolved', {ns: 'conflict_resolver'})},
+      {id: 'resolved', label: t('Resolved', {ns: 'conflict_resolver'})},
     ];
 
     let filtertable;
@@ -76,6 +79,7 @@ class ConflictResolver extends Component {
 
 window.addEventListener('load', () => {
   i18n.addResourceBundle('ja', 'conflict_resolver', {});
+  i18n.addResourceBundle('hi', 'conflict_resolver', hiStrings);
   const Index = withTranslation(
     ['conflict_resolver', 'loris']
   )(ConflictResolver);
@@ -84,3 +88,10 @@ window.addEventListener('load', () => {
   ).render(<Index />);
 });
 
+ConflictResolver.propTypes = {
+  t: PropTypes.func,
+};
+
+export default withTranslation(
+  ['conflict_resolver', 'loris'])(ConflictResolver);
+

modules/conflict_resolver/jsx/fix_conflict_form.js

@@ -5,6 +5,7 @@
 import {Component} from 'react';
 import PropTypes from 'prop-types';
 import {SelectElement} from 'jsx/Form';
+import {withTranslation} from 'react-i18next';
 
 /**
  * The fix FixConflictForm renders a <form> within a <td>. The form as a select
@@ -53,6 +54,7 @@ class FixConflictForm extends Component {
    * @param {string} value
    */
   resolveConflict(name, value) {
+    const {t} = this.props;
     fetch(loris.BaseURL.concat('/conflict_resolver/unresolved'), {
       method: 'POST',
       credentials: 'same-origin',
@@ -71,7 +73,7 @@ class FixConflictForm extends Component {
         this.setState({success: true, error: null, emptyOption: false, value});
       })
       .catch((error) => {
-        swal('Error!', error, 'error');
+        swal(t('Error!', {ns: 'loris'}), error, 'error');
         this.setState({error, success: false, emptyOption: true});
       });
   }
@@ -106,6 +108,7 @@ class FixConflictForm extends Component {
 FixConflictForm.propTypes = {
   conflictId: PropTypes.string.isRequired,
   options: PropTypes.object.isRequired,
+  t: PropTypes.func,
 };
 
-export default FixConflictForm;
+export default withTranslation(['conflict_resolver', 'loris'])(FixConflictForm);