Skip to content

[conflict_resolver] Translate conflict resolver #9953

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

Jump to bottom
Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

[conflict_resolver] Translate conflict resolver #9953

wants to merge 24 commits into from

Conversation

SKADE2303
Copy link
Collaborator

This PR is responsible for translating the module conflict_resolver to different languages. Currently only 'Hindi' language is supported but other languages can be added as required.

Testing instructions (if applicable)

  1. Run 'make dev' to load changes
  2. Change language_preference to Hindi in my_preferences Tab
  3. Go to conflict_resolver tab to see translated web page.

@SKADE2303 SKADE2303 added the Multilingual Any tasks related to making LORIS multilingual label Aug 11, 2025
@github-actions github-actions bot added Language: PHP PR or issue that update PHP code Language: Javascript PR or issue that update Javascript code Module: statistics PR or issue related to statistics module Module: acknowledgements PR or issue related to acknowledgements module Module: battery_manager PR or issue related to battery_manager module Module: behavioural_qc PR or issue related behavioural_qc module Module: candidate_list PR or issue related to candidate_list module Module: conflict_resolver PR or issue related to conflict_resolver module Module: datadict PR or issue related to (old) datadict module Module: dictionary PR or issue related to (new) dictionary module Module: electrophysiology_browser PR or issue related to electrophysiology_browser module Module: examiner PR or issue related to examiner module Module: genomic_browser PR or issue related to genomic_browser module Module: imaging_browser PR or issue related to imaging_browser module Module: media PR or issue related to media module Module: server_processes_manager PR or issue related to the server_processes_manger Module: survey_accounts PR or issue related to the survey_accounts module Module: user_accounts PR or issue related to the user_accounts module Module: dicom_archive PR or issue related to dicom_archive module labels Aug 11, 2025
@SKADE2303 SKADE2303 removed Language: PHP PR or issue that update PHP code Module: statistics PR or issue related to statistics module Module: acknowledgements PR or issue related to acknowledgements module Module: battery_manager PR or issue related to battery_manager module Module: behavioural_qc PR or issue related behavioural_qc module Module: candidate_list PR or issue related to candidate_list module Module: datadict PR or issue related to (old) datadict module Module: dictionary PR or issue related to (new) dictionary module Module: electrophysiology_browser PR or issue related to electrophysiology_browser module Module: examiner PR or issue related to examiner module labels Aug 11, 2025
Saket Hatwar and others added 21 commits October 6, 2025 05:43
Changes to add Hindi
8b71594
[candidate_list] Translate candidate_list module
1c94882 
This translates the candidate list module as an example of how
to do localization of a loris module that is written in React
with class based components.
Translate strings from data table / filters so that candidate list mo…
3aa2a9f 
…dule is fully translated
Added translated strings
217f06b
Revert parts of commit a049917: remove extra Hindi files and changes
8d98a52
@SKADE2303
Update Makefile
521829a
[candidate_list] Translate candidate_list module
187b7e1 
This translates the candidate list module as an example of how
to do localization of a loris module that is written in React
with class based components.
Translate strings from data table / filters so that candidate list mo…
8452467 
…dule is fully translated
Revert "Translate strings from data table / filters so that candidate…
b15b85f 
… list module is fully translated"

This reverts commit b467ce6.
Fix eslint
5565530
Translate strings from data table / filters so that candidate list mo…
5d7f1cd 
…dule is fully translated
Add withTranslation for conflict_resolver
7545ede 
Also fix syntax of export to fix tests.
change DataTable.js
db70d5c
lint issues
ffb4fae
lint
a6004b8
remove additional .po file
c2120b2
Add Translation
285ec28
lint
eef3192
Add Translation
987c1c6
lint
0ffb0d1
Add Makefile
3122dc0
@SKADE2303 SKADE2303 force-pushed the TranslateConflictResolver branch from da6bcdb to f6bc95c Compare October 6, 2025 09:57
@github-actions github-actions bot added Module: candidate_list PR or issue related to candidate_list module Module: datadict PR or issue related to (old) datadict module labels Oct 6, 2025
@SKADE2303 SKADE2303 force-pushed the TranslateConflictResolver branch from f6bc95c to c5f9353 Compare October 6, 2025 10:09
@SKADE2303 SKADE2303 force-pushed the TranslateConflictResolver branch from c5f9353 to 4dc34b8 Compare October 6, 2025 10:29
@SKADE2303 SKADE2303 removed State: Needs work PR awaiting additional work by the author to proceed Module: datadict PR or issue related to (old) datadict module labels Oct 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@driusan driusan driusan left review comments

@racostas racostas racostas requested changes

Requested changes must be addressed to merge this pull request.

Assignees

@racostas racostas

Labels

Event: GSOC PR or issue accepted for Google Summer of Code Language: Javascript PR or issue that update Javascript code Module: candidate_list PR or issue related to candidate_list module Module: conflict_resolver PR or issue related to conflict_resolver module Multilingual Any tasks related to making LORIS multilingual

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@SKADE2303 @driusan @racostas