[conflict_resolver] Translate conflict resolver

Makefile

@@ -78,13 +78,13 @@ locales:
 	msgfmt -o modules/bvl_feedback/locale/ja/LC_MESSAGES/bvl_feedback.mo modules/bvl_feedback/locale/ja/LC_MESSAGES/bvl_feedback.po
 	msgfmt -o modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.mo modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.po
 	npx i18next-conv -l ja -s modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.po -t modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.json
-	msgfmt -o modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.mo modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.po
-	npx i18next-conv -l hi -s modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.po -t modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.json
 	msgfmt -o modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.mo modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.po
 	msgfmt -o modules/candidate_profile/locale/ja/LC_MESSAGES/candidate_profile.mo modules/candidate_profile/locale/ja/LC_MESSAGES/candidate_profile.po
 	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
 	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
 	msgfmt -o modules/create_timepoint/locale/es/LC_MESSAGES/create_timepoint.mo modules/create_timepoint/locale/es/LC_MESSAGES/create_timepoint.po
@@ -143,8 +143,9 @@ 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 
+	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
+	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
@@ -168,7 +169,6 @@ issue_tracker: modules/issue_tracker/locale/ja/LC_MESSAGES/issue_tracker.mo
 
 candidate_list: modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.mo modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.mo
 	npx i18next-conv -l ja -s modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.po -t modules/candidate_list/locale/ja/LC_MESSAGES/candidate_list.json
-	npx i18next-conv -l hi -s modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.po -t modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.json
 	target=candidate_list npm run compile
 
 candidate_parameters: modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.mo
@@ -184,4 +184,7 @@ server_processes_manager: modules/server_processes_manager/locale/ja/LC_MESSAGES
 	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
 	target=conflict_resolver npm run compile
+

jsx/DataTable.js

@@ -563,6 +563,7 @@ class DataTable extends Component {
        ({this.props.t('Maximum rows per page:')} {rowsPerPageDropdown})
     </span>;
 
+
     let header = this.props.hide.rowsPerPage === true ? '' : (
       <div className="table-header">
         <div className="row">
@@ -601,7 +602,7 @@ class DataTable extends Component {
                   className="btn btn-primary"
                   onClick={this.downloadCSV.bind(null, filteredRowIndexes)}
                 >
-                  {this.props.t('Download Data as CSV')}
+                  {this.props.t('Download Table as CSV')}
                 </button>)
               }
               <PaginationLinks

locale/hi/LC_MESSAGES/loris.po

@@ -26,19 +26,19 @@ msgid "DEV"
 msgstr "डेव"
 
 msgid "Affiliations"
-msgstr "संबद्धता"
+msgstr "अफिलिएशन्स"
 
 msgid "Site Affiliation"
-msgstr "साइट संबद्धता"
+msgstr "साइट अफिलिएशन"
 
 msgid "Site Affiliations"
-msgstr "साइट संबद्धताएँ"
+msgstr "साइट अफिलिएशन्स"
 
 msgid "Project Affiliation"
-msgstr "परियोजना संबद्धता"
+msgstr "प्रोजेक्ट अफिलिएशन"
 
 msgid "Project Affiliations"
-msgstr "परियोजना संबद्धताएँ"
+msgstr "प्रोजेक्ट अफिलिएशन्स"
 
 msgid "Log Out"
 msgstr "लॉग आउट"
@@ -57,7 +57,6 @@ 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
@@ -79,7 +78,7 @@ msgstr "उपकरण"
 #: modules/examiner/php/module.class.inc:50
 #: modules/media/php/module.class.inc:33
 msgid "Clinical"
-msgstr "नैदानिक"
+msgstr "क्लिनिकल"
 
 #: modules/dicom_archive/php/module.class.inc:115
 #: modules/imaging_browser/php/module.class.inc:40
@@ -111,7 +110,7 @@ msgstr "रिपोर्ट्स"
 
 # Common loris terms. Consider moving these to their own textdomain?
 msgid "TimePoint"
-msgstr "समय बिंदु"
+msgstr "टाइमपॉइंट"
 
 # Common select option labels
 msgid "Yes"
@@ -120,6 +119,19 @@ msgstr "हाँ"
 msgid "No"
 msgstr "नहीं"
 
+# Filters
+msgid "Selection Filter"
+msgstr "सेलेक्शन फ़िल्टर"
+
+msgid "Show Filters"
+msgstr "फ़िल्टर दिखाएँ"
+
+msgid "Hide Filters"
+msgstr "फ़िल्टर छुपाएँ"
+
+msgid "Clear Filters"
+msgstr "फ़िल्टर साफ़ करें"
+
 # Common candidate terms
 msgid "PSCID"
 msgstr "पीएससीआईडी"
@@ -128,7 +140,7 @@ msgid "DCCID"
 msgstr "डीसीसीआईडी"
 
 msgid "Visit Label"
-msgstr "दौरे का लेबल"
+msgstr "भेंट लेबल"
 
 msgid "Site"
 msgstr "साइट"

locale/loris.pot

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 # Default LORIS strings to be translated (English).
 # Copy this to a language specific file and add translations to the
 # new file.
@@ -63,9 +65,6 @@ msgstr ""
 #: modules/datadict/php/module.class.inc:49
 #: modules/data_release/php/module.class.inc:56
 #: modules/dictionary/php/module.class.inc:49
-msgid "Data Dictionary"
-msgstr ""
-
 #: modules/document_repository/php/module.class.inc:56
 #: modules/instrument_builder/php/module.class.inc:48
 #: modules/issue_tracker/php/module.class.inc:54
@@ -119,13 +118,6 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-# Common swal labels
-msgid "Cancel"
-msgstr ""
-
-msgid "Success!"
-msgstr ""
-
 # Common candidate terms
 msgid "PSCID"
 msgstr ""
@@ -139,21 +131,12 @@ msgstr ""
 msgid "Site"
 msgstr ""
 
-msgid "Module"
-msgstr ""
-
 msgid "Project"
 msgstr ""
 
 msgid "Cohort"
 msgstr ""
 
-msgid "Cohorts"
-msgstr ""
-
-msgid "Session"
-msgstr ""
-
 msgid "Date of registration"
 msgstr ""
 
@@ -172,90 +155,12 @@ msgstr ""
 msgid "Scans"
 msgstr ""
 
-msgid "Stage"
-msgstr ""
-
-msgid "Sent To DCC"
-msgstr ""
-
-msgid "Date of Birth"
-msgstr ""
-
-msgid "Visits"
-msgstr ""
-
-msgid "An error occured while loading the page."
-msgstr ""
-
-msgid "Entity Type"
-msgstr ""
-
-msgid "Scan Done"
-msgstr ""
-
-msgid "Show Advanced Filters"
-msgstr ""
-
-msgid "Hide Advanced Filters"
-msgstr ""
-
-msgid "Language"
-msgstr ""
-
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr ""
 
 msgid "Maximum rows per page:"
 msgstr ""
 
-msgid "Download Data as CSV"
-msgstr ""
-
-# Dashboard panel strings
-msgid "Views"
-msgstr ""
-
-# Common strings on widgets
-msgid "NEW"
-msgstr ""
-
-msgid "Updated"
-msgstr ""
-
-msgid "Uploaded"
-msgstr ""
-
-msgid "Total"
-msgstr ""
-
-# Common timepoint and vist terms
-msgid "Not Started"
-msgstr ""
-
-msgid "Screening"
-msgstr ""
-
-msgid "Visit"
-msgstr ""
-
-msgid "Approval"
-msgstr ""
-
-msgid "Subject"
-msgstr ""
-
-msgid "Recycling Bin"
-msgstr ""
-
-msgid "Pass"
-msgstr ""
-
-msgid "Failure"
-msgstr ""
-
-msgid "Withdrawal"
-msgstr ""
-
-msgid "In Progress"
+msgid "Download Table as CSV"
 msgstr ""

modules/candidate_list/jsx/candidateListIndex.js

@@ -13,7 +13,6 @@ import i18n from 'I18nSetup';
 import {withTranslation} from 'react-i18next';
 
 import jaStrings from '../locale/ja/LC_MESSAGES/candidate_list.json';
-import hiStrings from '../locale/hi/LC_MESSAGES/candidate_list.json';
 
 /**
  * Candidate List
@@ -408,8 +407,6 @@ CandidateListIndex.propTypes = {
 window.addEventListener('load', () => {
   const args = QueryString.get();
   i18n.addResourceBundle('ja', 'candidate_list', jaStrings);
-  i18n.addResourceBundle('hi', 'candidate_list', hiStrings);
-
 
   const CLIndex = withTranslation(
     ['candidate_list', 'loris']

modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.po

@@ -22,12 +22,10 @@ msgid "Access Profile"
 msgstr "प्रोफ़ाइल तक पहुँचें"
 
 
-
 msgid "Visit Count"
 msgstr "आगंतुक गणना"
 
 msgid "Open Profile"
 msgstr "प्रोफ़ाइल खोलें"
 
 
-

modules/conflict_resolver/jsx/CandidateConflictsWidget.js

@@ -2,6 +2,7 @@ import '../../../node_modules/c3/c3.css';
 import c3 from 'c3';
 import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
+import {withTranslation} from 'react-i18next';
 
 /**
  * Renders a representation of the candidate conflicts as a React
@@ -11,6 +12,7 @@ import PropTypes from 'prop-types';
  * @return {object}
  */
 function CandidateConflictsWidget(props) {
+  const {t} = props;
   const visits = getVisits(props.Conflicts);
   const instruments = getInstruments(props.Conflicts);
 
@@ -34,14 +36,14 @@ function CandidateConflictsWidget(props) {
           type: 'category',
           categories: visits,
           label: {
-            text: 'Visit',
+            text: t('Visit', {ns: 'conflict_resolver'}),
             position: 'outer-center',
           },
         },
         y: {
           label: {
             position: 'outer-middle',
-            text: 'Number of Conflicts',
+            text: t('Number of Conflicts', {ns: 'conflict_resolver'}),
           },
         },
       },
@@ -64,12 +66,14 @@ function CandidateConflictsWidget(props) {
     <div id='conflictschart' />
     <ul>
       <li>
-        {'Click on instrument in legend to visit conflict resolver '
-                + 'for that instrument across all visits.'}
+        {t('Click on instrument in legend to visit conflict resolver' +
+        ' for that instrument across all visits.',
+        {ns: 'conflict_resolver'})}
       </li>
       <li>
-        {'Click on bar in graph to visit conflict resolver '
-                + 'for that visit and instrument combination.'}
+        {t('Click on bar in graph to visit conflict resolver' +
+        ' for that visit and instrument combination.',
+        {ns: 'conflict_resolver'})}
       </li>
     </ul>
   </div>;
@@ -78,6 +82,7 @@ CandidateConflictsWidget.propTypes = {
   Conflicts: PropTypes.array,
   BaseURL: PropTypes.string,
   Candidate: PropTypes.object,
+  t: PropTypes.func,
 };
 
 /**
@@ -150,4 +155,5 @@ function getDataBreakdown(visits, instruments, conflicts) {
   return data;
 }
 
-export default CandidateConflictsWidget;
+export default withTranslation(
+  ['conflict_resolver', 'loris'])(CandidateConflictsWidget);