From b3fbf72f1b2e74f8c84cdaaf5f7dcb135fc6a49d Mon Sep 17 00:00:00 2001
From: Joy A <itsjoy@gmail.com>
Date: Mon, 19 Feb 2024 10:17:58 +0530
Subject: [PATCH] #1283 | Display address filter help text consistently. -
 Introduce new translation key so users on older versions don't see incorrect
 help text

---
 .../src/service/reports/DashboardFilterService.js              | 1 -
 packages/openchs-android/src/views/filter/FiltersView.js       | 3 ++-
 packages/openchs-android/src/views/filter/FiltersViewV2.js     | 2 +-
 .../src/views/individual/IndividualSearchView.js               | 3 ++-
 packages/openchs-android/translations/en.json                  | 3 ++-
 packages/openchs-android/translations/gu_IN.json               | 3 ++-
 packages/openchs-android/translations/hi_IN.json               | 3 ++-
 packages/openchs-android/translations/ka_IN.json               | 3 ++-
 packages/openchs-android/translations/mr_IN.json               | 3 ++-
 packages/openchs-android/translations/ta_IN.json               | 3 ++-
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/openchs-android/src/service/reports/DashboardFilterService.js b/packages/openchs-android/src/service/reports/DashboardFilterService.js
index 71ba32643..e8da054f4 100644
--- a/packages/openchs-android/src/service/reports/DashboardFilterService.js
+++ b/packages/openchs-android/src/service/reports/DashboardFilterService.js
@@ -13,7 +13,6 @@ import {
 } from 'openchs-models';
 import {DashboardReportFilter} from "../../model/DashboardReportFilters";
 import _ from "lodash";
-import General from "../../utility/General";
 import AddressLevelService from "../AddressLevelService";
 import GlobalContext from "../../GlobalContext";
 
diff --git a/packages/openchs-android/src/views/filter/FiltersView.js b/packages/openchs-android/src/views/filter/FiltersView.js
index fc4ccc869..1bc1bb5d7 100644
--- a/packages/openchs-android/src/views/filter/FiltersView.js
+++ b/packages/openchs-android/src/views/filter/FiltersView.js
@@ -272,7 +272,8 @@ class FilterView extends AbstractComponent {
                                                 addressLevelState: addressLevelState
                                             })
                                         }}
-                                        multiSelect={true}/> : null}
+                                        multiSelect={true}
+                                        userHintText={this.I18n.t('addressFilterImplicitBehaviorHint')}/> : null}
                                 {!_.isEmpty(bottomLevelFilters) ?
                                     <CustomFilters filters={bottomLevelFilters}
                                                    selectedCustomFilters={this.props.selectedCustomFilters}
diff --git a/packages/openchs-android/src/views/filter/FiltersViewV2.js b/packages/openchs-android/src/views/filter/FiltersViewV2.js
index 330afacd7..32aa0921a 100644
--- a/packages/openchs-android/src/views/filter/FiltersViewV2.js
+++ b/packages/openchs-android/src/views/filter/FiltersViewV2.js
@@ -184,7 +184,7 @@ class FiltersViewV2 extends AbstractComponent {
                                                               key={index}
                                                               onSelect={(updatedAddressLevelState) => this.dispatchFilterUpdate(filter, updatedAddressLevelState)}
                                                               multiSelect={true}
-                                                              userHintText={this.I18n.t('addressFilterBehaviorHint')}/>;
+                                                              userHintText={this.I18n.t('addressFilterImplicitBehaviorHint')}/>;
                                     case CustomFilter.type.RegistrationDate:
                                     case CustomFilter.type.EnrolmentDate:
                                     case CustomFilter.type.ProgramEncounterDate:
diff --git a/packages/openchs-android/src/views/individual/IndividualSearchView.js b/packages/openchs-android/src/views/individual/IndividualSearchView.js
index 8466f348f..a958d340d 100644
--- a/packages/openchs-android/src/views/individual/IndividualSearchView.js
+++ b/packages/openchs-android/src/views/individual/IndividualSearchView.js
@@ -138,7 +138,8 @@ class IndividualSearchView extends AbstractComponent {
                                 onSelect={(addressLevelState) =>
                                     this.dispatchAction(Actions.TOGGLE_INDIVIDUAL_SEARCH_ADDRESS_LEVEL, {values: addressLevelState})
                                 }
-                                multiSelect={true}/>}
+                                multiSelect={true}
+                                userHintText={this.I18n.t('addressFilterImplicitBehaviorHint')}/>}
                             <>
                                 <Text style={Styles.formLabel}>{this.I18n.t("includeVoided")}</Text>
                                 <Checkbox.Group accessibilityLabel={this.I18n.t("includeVoided")}
diff --git a/packages/openchs-android/translations/en.json b/packages/openchs-android/translations/en.json
index 87e92743e..b52d3e3fd 100644
--- a/packages/openchs-android/translations/en.json
+++ b/packages/openchs-android/translations/en.json
@@ -493,6 +493,7 @@
     "enterNewPasswordFor" : "Enter new password for {{userName}}",
     "enterOTP" : "Enter OTP",
     "backgroundSyncInProgress" : "Auto sync is in progress. Please try again after sometime.",
-    "addressFilterBehaviorHint": "(Selection includes lower levels implicitly)"
+    "addressFilterBehaviorHint": "(Choose exact level at which subject is registered)",
+    "addressFilterImplicitBehaviorHint": "(Selection includes lower levels implicitly)"
   }
 }
diff --git a/packages/openchs-android/translations/gu_IN.json b/packages/openchs-android/translations/gu_IN.json
index af4853c28..d3f5c6d6d 100644
--- a/packages/openchs-android/translations/gu_IN.json
+++ b/packages/openchs-android/translations/gu_IN.json
@@ -299,6 +299,7 @@
     "trackLocation": "ટ્રૅક સ્થાન",
     "disableAutoSync": "સ્વતઃ સમન્વયન અક્ષમ કરો",
     "autoSync": "સ્વતઃ સમન્વયન",
-    "addressFilterBehaviorHint": "(પસંદગીમાં નિમ્ન સ્તરનો ગર્ભિત સમાવેશ થાય છે)"
+    "addressFilterBehaviorHint": "(યોગ્ય સ્તર પસંદ કરો કે જેમાં વિષય નોંધાયેલ છે)",
+    "addressFilterImplicitBehaviorHint": "(પસંદગીમાં નિમ્ન સ્તરનો ગર્ભિત સમાવેશ થાય છે)"
   }
 }
diff --git a/packages/openchs-android/translations/hi_IN.json b/packages/openchs-android/translations/hi_IN.json
index f73c32daf..d4db13dc3 100644
--- a/packages/openchs-android/translations/hi_IN.json
+++ b/packages/openchs-android/translations/hi_IN.json
@@ -366,6 +366,7 @@
     "disableAutoSync": "ऑटो सिंक अक्षम करें",
     "autoSync": "ऑटो सिंक",
     "backgroundSyncInProgress": "ऑटो सिंक प्रगति पर है| कृपया कुछ देर बाद प्रयास करें।",
-    "addressFilterBehaviorHint": "(चयन में निचले स्तर परोक्ष रूप से शामिल हैं)"
+    "addressFilterBehaviorHint": "(वही लोकेशन जहाँ सब्जेक्ट रजिस्टर्ड है)",
+    "addressFilterImplicitBehaviorHint": "(चयन में निचले स्तर परोक्ष रूप से शामिल हैं)"
   }
 }
diff --git a/packages/openchs-android/translations/ka_IN.json b/packages/openchs-android/translations/ka_IN.json
index 3e6b18d46..387de8ef4 100644
--- a/packages/openchs-android/translations/ka_IN.json
+++ b/packages/openchs-android/translations/ka_IN.json
@@ -307,6 +307,7 @@
     "autoRefresh": "ಡ್ಯಾಶ್ಬೋರ್ಡ್ ಸ್ವಯಂ ರಿಫ್ರೆಶ್",
     "disableAutoSync": "ಸ್ವಯಂ ಸಿಂಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ",
     "autoSync": "ಸ್ವಯಂ ಸಿಂಕ್",
-    "addressFilterBehaviorHint": "(ಆಯ್ಕೆಯು ಕೆಳ ಹಂತಗಳನ್ನು ಸೂಚ್ಯವಾಗಿ ಒಳಗೊಂಡಿರುತ್ತದೆ)"
+    "addressFilterBehaviorHint": "(ಯಾವ ವಿಷಯವನ್ನು ನೋಂದಾಯಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ನಿಖರವಾದ ಮಟ್ಟವನ್ನು ಆರಿಸಿ)",
+    "addressFilterImplicitBehaviorHint": "(ಆಯ್ಕೆಯು ಕೆಳ ಹಂತಗಳನ್ನು ಸೂಚ್ಯವಾಗಿ ಒಳಗೊಂಡಿರುತ್ತದೆ)"
   }
 }
diff --git a/packages/openchs-android/translations/mr_IN.json b/packages/openchs-android/translations/mr_IN.json
index 4553e5a13..3c7ed9866 100644
--- a/packages/openchs-android/translations/mr_IN.json
+++ b/packages/openchs-android/translations/mr_IN.json
@@ -296,6 +296,7 @@
     "autoRefresh": "डॅशबोर्ड ऑटो रिफ्रेश",
     "disableAutoSync": "ऑटो सिंक अक्षम करा",
     "autoSync": "ऑटो सिंक",
-    "addressFilterBehaviorHint": "(निवडीत खालच्या स्तरांचा समावेश होतो)"
+    "addressFilterBehaviorHint": "(कोणत्या विषयावर नोंदणी केली आहे ते अचूक स्तर निवडा)",
+    "addressFilterImplicitBehaviorHint": "(निवडीत खालच्या स्तरांचा समावेश होतो)"
   }
 }
diff --git a/packages/openchs-android/translations/ta_IN.json b/packages/openchs-android/translations/ta_IN.json
index aa81fa68f..177aea0bd 100755
--- a/packages/openchs-android/translations/ta_IN.json
+++ b/packages/openchs-android/translations/ta_IN.json
@@ -307,6 +307,7 @@
     "autoRefresh": "டாஷ்போர்டு தானியங்கு புதுப்பிப்பு",
     "disableAutoSync": "தானியங்கு ஒத்திசைவை முடக்கு",
     "autoSync": "தானியங்கு ஒத்திசைவு",
-    "addressFilterBehaviorHint": "(தேர்வு என்பது கீழ்நிலைகளை மறைமுகமாக உள்ளடக்கியது)"
+    "addressFilterBehaviorHint": "(எந்த பாடத்தில் பதிவு செய்யப்பட்டுள்ளது என்பதை சரியான அளவில் தேர்வு செய்யவும்)",
+    "addressFilterImplicitBehaviorHint": "(தேர்வு என்பது கீழ்நிலைகளை மறைமுகமாக உள்ளடக்கியது)"
   }
 }