fix: adjust help and description texts

dhis2 · Dec 17, 2024 · ec05922 · ec05922
1 parent 7e5b7a7
commit ec05922
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 30 deletions.
diff --git a/src/components/form/attributes/CustomAttributes.tsx b/src/components/form/attributes/CustomAttributes.tsx
@@ -121,7 +121,7 @@ export function CustomAttributesSection({
 
             <StandardFormSectionDescription>
                 {i18n.t(
-                    'Set up information for the attributes assigned to {{modelName}}',
+                    'Set up information for the attributes assigned to {{modelName}}.',
                     { modelName: schemaSection.titlePlural.toLowerCase() }
                 )}
             </StandardFormSectionDescription>

diff --git a/src/components/form/fields/ShortNameField.tsx b/src/components/form/fields/ShortNameField.tsx
@@ -49,7 +49,7 @@ export function ShortNameField({
     })
 
     const helpString =
-        helpText || i18n.t('Often used in reports where space is limited')
+        helpText || i18n.t('Often used in reports where space is limited.')
 
     return (
         <FieldRFF<string | undefined>

diff --git a/src/pages/categories/form/CategoryFormFields.tsx b/src/pages/categories/form/CategoryFormFields.tsx
@@ -42,7 +42,7 @@ export const CategoryFormFields = () => {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose how this category option group will be used to capture and analyze'
+                        'Choose how this category option group will be used to capture and analyze data.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>
@@ -72,7 +72,7 @@ export const CategoryFormFields = () => {
                         component={CheckboxFieldFF}
                         label={i18n.t('Use as data dimension')}
                         helpText={i18n.t(
-                            'Category option group will be available to the analytics as another dimension'
+                            'Make available to analytics apps as a selectable dimension.'
                         )}
                     />
                 </StandardFormField>
@@ -85,9 +85,7 @@ export const CategoryFormFields = () => {
                     </label>
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
-                    {i18n.t(
-                        'Choose the category options to include in this category option group.'
-                    )}
+                    {i18n.t('Choose the options to include in this category.')}
                 </StandardFormSectionDescription>
                 <StandardFormField>
                     <StandardFormField>

diff --git a/src/pages/categoryCombos/form/CategoryComboFormFields.tsx b/src/pages/categoryCombos/form/CategoryComboFormFields.tsx
@@ -26,7 +26,9 @@ export const CategoryComboFormFields = () => {
                     {i18n.t('Basic information')}
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
-                    {i18n.t('Set up the basic information for this category.')}
+                    {i18n.t(
+                        'Set up the basic information for this category combination.'
+                    )}
                 </StandardFormSectionDescription>
                 <StandardFormField>
                     <NameField schemaSection={section} />
@@ -43,7 +45,7 @@ export const CategoryComboFormFields = () => {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose how this category combo will be used to capture and analyze data.'
+                        'Choose how this category combination will be used to capture and analyze data.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>
@@ -84,7 +86,7 @@ export const CategoryComboFormFields = () => {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose the categories to include in this category combo.'
+                        'Choose the categories to include in this category combination.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>

diff --git a/src/pages/categoryOptionCombos/form/CategoryOptionComboFormFields.tsx b/src/pages/categoryOptionCombos/form/CategoryOptionComboFormFields.tsx
@@ -22,7 +22,9 @@ export const CategoryOptionComboFormFields = () => {
                     {i18n.t('Basic information')}
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
-                    {i18n.t('Set up the basic information for this category.')}
+                    {i18n.t(
+                        'Set up the basic information for this category option combination.'
+                    )}
                 </StandardFormSectionDescription>
                 <StandardFormField>
                     <Field<string | undefined>

diff --git a/src/pages/categoryOptionGroupSets/form/CategoryOptionGroupSetFormFields.tsx b/src/pages/categoryOptionGroupSets/form/CategoryOptionGroupSetFormFields.tsx
@@ -43,7 +43,7 @@ function CategoryOptionGroupSetFormFields() {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose how this category option group set will be used to capture and analyze'
+                        'Choose how this category option group set will be used to capture and analyze data.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>
@@ -73,7 +73,7 @@ function CategoryOptionGroupSetFormFields() {
                         component={CheckboxFieldFF}
                         label={i18n.t('Use as data dimension')}
                         helpText={i18n.t(
-                            'Category option group set will be available to the analytics as another dimension'
+                            'Make available to analytics apps as a selectable dimension.'
                         )}
                     />
                 </StandardFormField>
@@ -82,7 +82,7 @@ function CategoryOptionGroupSetFormFields() {
             <StandardFormSection>
                 <StandardFormSectionTitle>
                     <label htmlFor={'categoryOptionGroups'}>
-                        {i18n.t('Category option Groups')}
+                        {i18n.t('Category option groups')}
                     </label>
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>

diff --git a/src/pages/categoryOptionGroups/form/CategoryOptionGroupFormFields.tsx b/src/pages/categoryOptionGroups/form/CategoryOptionGroupFormFields.tsx
@@ -43,7 +43,7 @@ function CategoryOptionGroupFormFields() {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose how this category option  will be used to capture and analyze'
+                        'Choose how this category option  will be used to capture and analyze data.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>
@@ -76,7 +76,7 @@ function CategoryOptionGroupFormFields() {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose the category options to include in this category.'
+                        'Choose the options to include in this category option group.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>

diff --git a/src/pages/categoryOptions/form/CategoryOptionFormFields.tsx b/src/pages/categoryOptions/form/CategoryOptionFormFields.tsx
@@ -55,7 +55,7 @@ export const CategoryOptionFormFields = () => {
                 </StandardFormSectionTitle>
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Choose when, and for which organisation units this category option will be available.'
+                        'Choose when, and for which organisation units, this category option will be available.'
                     )}
                 </StandardFormSectionDescription>
                 <StandardFormField>

diff --git a/src/pages/dataElementGroupSets/form/DataElementGroupSetFormFields.tsx b/src/pages/dataElementGroupSets/form/DataElementGroupSetFormFields.tsx
@@ -30,7 +30,7 @@ export function DataElementGroupSetFormFields() {
 
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Set up the information for this data element group'
+                        'Set up the information for this data element group set.'
                     )}
                 </StandardFormSectionDescription>
 
@@ -40,7 +40,7 @@ export function DataElementGroupSetFormFields() {
                     <DescriptionField
                         schemaSection={section}
                         helpText={i18n.t(
-                            'Explain the purpose of this data element group.'
+                            'Explain the purpose of this data element group set.'
                         )}
                     />
                 </StandardFormField>

diff --git a/src/pages/dataElementGroups/form/DataElementGroupFormFields.tsx b/src/pages/dataElementGroups/form/DataElementGroupFormFields.tsx
@@ -26,7 +26,7 @@ export function DataElementGroupFormFields() {
 
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Set up the information for this data element group'
+                        'Set up the information for this data element group.'
                     )}
                 </StandardFormSectionDescription>
 

diff --git a/src/pages/dataElements/fields/AggregationLevelsField.tsx b/src/pages/dataElements/fields/AggregationLevelsField.tsx
@@ -38,9 +38,6 @@ export function AggregationLevelsField() {
                 <Field
                     name="aggregationLevels"
                     label={i18n.t('Aggregation level(s)')}
-                    helpText={i18n.t(
-                        'Choose how this data element is disaggregated'
-                    )}
                     validationText={meta.touched ? meta.error : undefined}
                     error={meta.touched && !!meta.error}
                     dataTest="formfields-aggregationlevels"

diff --git a/src/pages/dataElements/fields/CategoryComboField.tsx b/src/pages/dataElements/fields/CategoryComboField.tsx
@@ -62,7 +62,7 @@ export function CategoryComboField() {
                         fieldLabel: i18n.t('Category combination'),
                     })}
                     helpText={i18n.t(
-                        'Choose how this data element is disaggregated'
+                        'Choose how this data element is disaggregated.'
                     )}
                     error={meta.touched && !!meta.error}
                     validationText={meta.touched ? meta.error : undefined}

diff --git a/src/pages/dataElements/fields/OptionSetCommentField.tsx b/src/pages/dataElements/fields/OptionSetCommentField.tsx
@@ -37,7 +37,7 @@ export function OptionSetCommentField() {
                     name="commentOptionSet.id"
                     label={i18n.t('Option set comment')}
                     helpText={i18n.t(
-                        'Choose a set of predefined comment for data entry'
+                        'Choose a set of predefined comments for data entry.'
                     )}
                     validationText={meta.touched ? meta.error : undefined}
                     error={meta.touched && !!meta.error}

diff --git a/src/pages/dataElements/fields/OptionSetField.tsx b/src/pages/dataElements/fields/OptionSetField.tsx
@@ -32,7 +32,7 @@ export function OptionSetField() {
                     name="optionSet.id"
                     label={i18n.t('Option set')}
                     helpText={i18n.t(
-                        'Choose a set of predefined options for data entry'
+                        'Choose a set of predefined options for data entry.'
                     )}
                     validationText={meta.touched ? meta.error : undefined}
                     error={meta.touched && !!meta.error}

diff --git a/src/pages/dataElements/fields/UrlField.tsx b/src/pages/dataElements/fields/UrlField.tsx
@@ -18,7 +18,7 @@ export function UrlField() {
             inputWidth="400px"
             name="url"
             label={i18n.t('Url')}
-            helpText={i18n.t('A web link that provides extra information')}
+            helpText={i18n.t('A web link that provides extra information.')}
             validateFields={[]}
             validate={validate}
         />

diff --git a/src/pages/dataElements/form/DataElementFormFields.tsx b/src/pages/dataElements/form/DataElementFormFields.tsx
@@ -40,7 +40,7 @@ export function DataElementFormFields() {
                 </StandardFormSectionTitle>
 
                 <StandardFormSectionDescription>
-                    {i18n.t('Set up the information for this data element')}
+                    {i18n.t('Set up the information for this data element.')}
                 </StandardFormSectionDescription>
 
                 <StandardFormField>
@@ -126,7 +126,7 @@ export function DataElementFormFields() {
 
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'Visualize values for this data element in Analytics app. Multiple legendSet can be applied.'
+                        'Visualize values for this data element in Analytics app. Multiple legends can be applied.'
                     )}
                 </StandardFormSectionDescription>
 
@@ -142,7 +142,7 @@ export function DataElementFormFields() {
 
                 <StandardFormSectionDescription>
                     {i18n.t(
-                        'By default, the aggregation will start at the lowest assigned organisation unit. If you for example select "Chiefdom", it means that "Chiefdom", "District" and "National" aggregates use "Chiefdom" (the highest aggregation level available) as the data source, and PHU data will not be included. PHU will still be available for the PHU level, but not included in the aggregations to the levels above.'
+                        'By default, aggregation starts at the lowest assigned organisation unit. You can override this by choosing a different level. Choosing a higher level means that data from lower levels will not be included in the aggregation.'
                     )}
                 </StandardFormSectionDescription>