Merge branch 'dev' into fix/DHIS2-10235-limit-values

dhis2 · Oct 2, 2023 · ead7fd0 · ead7fd0
2 parents 7be3462 + 3828e46
commit ead7fd0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/cypress/elements/optionsModal/legend.js b/cypress/elements/optionsModal/legend.js
@@ -20,15 +20,12 @@ export const toggleLegend = () =>
         .click()
 
 export const changeDisplayStrategyToFixed = () =>
-    cy
-        .getBySel(optionsModalContentEl)
-        .contains('Select a single legend for the entire visualization')
-        .click()
+    cy.getBySel(optionsModalContentEl).contains('Select a legend').click()
 
 export const changeDisplayStrategyToByDataItem = () =>
     cy
         .getBySel(optionsModalContentEl)
-        .contains('Use pre-defined legend per data item')
+        .contains('Use pre-defined legend by data item')
         .click()
 
 export const changeDisplayStyleToText = () =>

diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-05-30T12:32:59.044Z\n"
-"PO-Revision-Date: 2023-05-30T12:32:59.044Z\n"
+"POT-Creation-Date: 2023-09-06T13:41:14.540Z\n"
+"PO-Revision-Date: 2023-09-06T13:41:14.540Z\n"
 
 msgid "All items"
 msgstr "All items"
@@ -480,11 +480,11 @@ msgstr "Legend style"
 msgid "Legend type"
 msgstr "Legend type"
 
-msgid "Use pre-defined legend per data item"
-msgstr "Use pre-defined legend per data item"
+msgid "Use pre-defined legend by data item"
+msgstr "Use pre-defined legend by data item"
 
-msgid "Select a single legend for the entire visualization"
-msgstr "Select a single legend for the entire visualization"
+msgid "Select a legend"
+msgstr "Select a legend"
 
 msgid "Legend changes background color"
 msgstr "Legend changes background color"

diff --git a/src/components/VisualizationOptions/Options/LegendDisplayStrategy.js b/src/components/VisualizationOptions/Options/LegendDisplayStrategy.js
@@ -18,7 +18,7 @@ const LegendDisplayStrategy = ({ value, onChange }) => (
         <Field name={OPTION_LEGEND_DISPLAY_STRATEGY} dense>
             <Radio
                 key={LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM}
-                label={i18n.t('Use pre-defined legend per data item')}
+                label={i18n.t('Use pre-defined legend by data item')}
                 value={LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM}
                 checked={value === LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM}
                 onChange={onChange}
@@ -27,9 +27,7 @@ const LegendDisplayStrategy = ({ value, onChange }) => (
             />
             <Radio
                 key={LEGEND_DISPLAY_STRATEGY_FIXED}
-                label={i18n.t(
-                    'Select a single legend for the entire visualization'
-                )}
+                label={i18n.t('Select a legend')}
                 value={LEGEND_DISPLAY_STRATEGY_FIXED}
                 checked={value === LEGEND_DISPLAY_STRATEGY_FIXED}
                 onChange={onChange}