From 91cf15cca0198186c5cce78f72c57be9f79a6a42 Mon Sep 17 00:00:00 2001
From: Birk Johansson <birk@dhis2.org>
Date: Tue, 6 Feb 2024 11:42:45 +0100
Subject: [PATCH] feat(program): add custom terminology for tracker (#2798)

---
 src/config/field-config/field-order.js |  9 +++++++++
 src/i18n/i18n_module_en.properties     | 20 ++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/config/field-config/field-order.js b/src/config/field-config/field-order.js
index ae58ce90e..4459f66a6 100644
--- a/src/config/field-config/field-order.js
+++ b/src/config/field-config/field-order.js
@@ -276,6 +276,13 @@ const fieldOrderByName = new Map([
         'displayIncidentDate',
         'incidentDateLabel',
         'enrollmentDateLabel',
+        'enrollmentLabel',
+        'followUpLabel',
+        'registeringUnitLabel',
+        'orgUnitLabel',
+        'relationshipLabel',
+        'noteLabel',
+        'trackedEntityAttributeLabel',
         'ignoreOverdueEvents',
         'featureType',
         'relatedProgram',
@@ -303,6 +310,8 @@ const fieldOrderByName = new Map([
         'preGenerateUID',
         'executionDateLabel',
         'dueDateLabel',
+        'programStageLabel',
+        'eventLabel',
     ]],
     ['trackedEntityAttribute', [
         'name',
diff --git a/src/i18n/i18n_module_en.properties b/src/i18n/i18n_module_en.properties
index 2388d0c82..effefeb43 100644
--- a/src/i18n/i18n_module_en.properties
+++ b/src/i18n/i18n_module_en.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Please select one data element
 single_event=Single event
 tracked_entity_instances=Tracked entity instances
 dob_type=DOB type
-date_of_enrollment_description=Description of enrollment date
-date_of_incident_description=Description of incident date
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Date of enrollment
 date_of_incident=Date of incident
 male=Male
@@ -2076,8 +2076,8 @@ select_incident_dates_in_future=Allow future incident dates
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Show incident date
-incident_date_label=Description of incident date
-enrollment_date_label=Description of enrollment date
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignore overdue events
 related_program=Related program
 assign_attributes=Assign attributes
@@ -2098,8 +2098,8 @@ block_entry_form=Block entry form after completed
 remind_completed=Ask user to complete program when stage is complete
 allow_generate_next_visit=Ask user to create new event when stage is complete
 generated_by_enrollment_date=Generate events based on enrollment date
-execution_date_label=Description of report date
-due_date_label=Description of due date
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Scheduled days from start
 pre_generate_uid=Pre-generate event UID
 standard_interval=Standard interval days
@@ -2331,3 +2331,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute