From ecb42d93d8a342dbf4fc6e41a09f590e02bb4c7e Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Fri, 15 Mar 2024 16:40:51 +0100 Subject: [PATCH 1/5] fix: translated aria-label of menu hamburger icon --- RELEASE.md | 6 ++++++ .../volto/components/theme/Navigation/Navigation.jsx | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 79b3c8b60..e19c24c71 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,6 +41,12 @@ - ... --> +## Versione X.X.X (dd/mm/yyyy) + +### Fix + +- Tradotto il messaggio per Screen Reader del bottone per aprire e chiudere il menu in mobile. + ## Versione 11.7.0 (15/03/2024) ### Novità diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index d8d984112..f6db59c76 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -100,7 +100,7 @@ const Navigation = ({ pathname }) => { { setCollapseOpen(!collapseOpen); setFocusTrapActive(!focusTrapActive); @@ -177,6 +177,10 @@ const messages = defineMessages({ id: 'close-menu', defaultMessage: 'Chiudi menu', }, + ToggleMenu: { + id: 'toggle-menu', + defaultMessage: 'Apri o chiudi il menu', + }, }); Navigation.propTypes = { From c92060ae588684618675438a09ee00fd699f508b Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Mon, 18 Mar 2024 10:08:07 +0100 Subject: [PATCH 2/5] fix: used collapseOpen variable to change aria-label message --- .../volto/components/theme/Navigation/Navigation.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index f6db59c76..678d69471 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -100,7 +100,9 @@ const Navigation = ({ pathname }) => { { setCollapseOpen(!collapseOpen); setFocusTrapActive(!focusTrapActive); @@ -179,7 +181,7 @@ const messages = defineMessages({ }, ToggleMenu: { id: 'toggle-menu', - defaultMessage: 'Apri o chiudi il menu', + defaultMessage: '{action} il menu', }, }); From f7132a3cbf86229d00b2c6afe4e0d986393c1d35 Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Mon, 25 Mar 2024 17:36:59 +0100 Subject: [PATCH 3/5] fix: added translation to overrideTranslations --- locales/de/LC_MESSAGES/volto.po | 5 +++++ locales/en/LC_MESSAGES/volto.po | 5 +++++ locales/es/LC_MESSAGES/volto.po | 5 +++++ locales/fr/LC_MESSAGES/volto.po | 5 +++++ locales/it/LC_MESSAGES/volto.po | 5 +++++ locales/volto.pot | 7 ++++++- .../volto/components/theme/Navigation/Navigation.jsx | 4 ---- src/overrideTranslations.jsx | 4 ++++ 8 files changed, 35 insertions(+), 5 deletions(-) diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po index 986324175..9e5d3f7e9 100644 --- a/locales/de/LC_MESSAGES/volto.po +++ b/locales/de/LC_MESSAGES/volto.po @@ -3936,6 +3936,11 @@ msgstr "" msgid "to" msgstr "" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po index 6a0c569ee..e9e252194 100644 --- a/locales/en/LC_MESSAGES/volto.po +++ b/locales/en/LC_MESSAGES/volto.po @@ -3921,6 +3921,11 @@ msgstr "title" msgid "to" msgstr "to" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po index af0188c2f..b0d8949f2 100644 --- a/locales/es/LC_MESSAGES/volto.po +++ b/locales/es/LC_MESSAGES/volto.po @@ -3930,6 +3930,11 @@ msgstr "título" msgid "to" msgstr "a" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po index 93196a701..43606b8fa 100644 --- a/locales/fr/LC_MESSAGES/volto.po +++ b/locales/fr/LC_MESSAGES/volto.po @@ -3938,6 +3938,11 @@ msgstr "titre" msgid "to" msgstr "au" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po index e1d3de2d7..45587a540 100644 --- a/locales/it/LC_MESSAGES/volto.po +++ b/locales/it/LC_MESSAGES/volto.po @@ -3921,6 +3921,11 @@ msgstr "titolo" msgid "to" msgstr "al" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/volto.pot b/locales/volto.pot index 845d7b47d..014e21e61 100644 --- a/locales/volto.pot +++ b/locales/volto.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plone\n" -"POT-Creation-Date: 2024-03-06T10:48:38.114Z\n" +"POT-Creation-Date: 2024-03-25T16:36:34.513Z\n" "Last-Translator: Plone i18n \n" "Language-Team: Plone i18n \n" "MIME-Version: 1.0\n" @@ -3923,6 +3923,11 @@ msgstr "" msgid "to" msgstr "" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index 678d69471..f7e2cc340 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -179,10 +179,6 @@ const messages = defineMessages({ id: 'close-menu', defaultMessage: 'Chiudi menu', }, - ToggleMenu: { - id: 'toggle-menu', - defaultMessage: '{action} il menu', - }, }); Navigation.propTypes = { diff --git a/src/overrideTranslations.jsx b/src/overrideTranslations.jsx index d9684857d..392f2212e 100644 --- a/src/overrideTranslations.jsx +++ b/src/overrideTranslations.jsx @@ -48,4 +48,8 @@ defineMessages({ id: 'form_default_cancel_label', defaultMessage: 'Annulla', }, + ToggleMenu: { + id: 'toggle-menu', + defaultMessage: '{action} il menu', + }, }); From d0e2b8d3690d58174b07569644fa74b93b95fed8 Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Wed, 27 Mar 2024 14:26:33 +0100 Subject: [PATCH 4/5] fix: added translations for toggleMenu --- locales/de/LC_MESSAGES/volto.po | 10 ++++++++++ locales/en/LC_MESSAGES/volto.po | 10 ++++++++++ locales/es/LC_MESSAGES/volto.po | 10 ++++++++++ locales/fr/LC_MESSAGES/volto.po | 10 ++++++++++ locales/it/LC_MESSAGES/volto.po | 10 ++++++++++ locales/volto.pot | 14 ++++++++++++-- .../components/theme/Navigation/Navigation.jsx | 18 ++++++++++++++++-- src/overrideTranslations.jsx | 10 +++++++++- 8 files changed, 87 insertions(+), 5 deletions(-) diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po index fc69a3063..aaa504d59 100644 --- a/locales/de/LC_MESSAGES/volto.po +++ b/locales/de/LC_MESSAGES/volto.po @@ -3946,6 +3946,16 @@ msgstr "" msgid "toggle-menu" msgstr "" +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po index da0613a00..07b4cb3de 100644 --- a/locales/en/LC_MESSAGES/volto.po +++ b/locales/en/LC_MESSAGES/volto.po @@ -3931,6 +3931,16 @@ msgstr "to" msgid "toggle-menu" msgstr "" +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po index 1e4aee4d6..3b0dd01d5 100644 --- a/locales/es/LC_MESSAGES/volto.po +++ b/locales/es/LC_MESSAGES/volto.po @@ -3940,6 +3940,16 @@ msgstr "a" msgid "toggle-menu" msgstr "" +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po index a856519c7..3108a9ac9 100644 --- a/locales/fr/LC_MESSAGES/volto.po +++ b/locales/fr/LC_MESSAGES/volto.po @@ -3948,6 +3948,16 @@ msgstr "au" msgid "toggle-menu" msgstr "" +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po index 146aafc38..eeabf98fb 100644 --- a/locales/it/LC_MESSAGES/volto.po +++ b/locales/it/LC_MESSAGES/volto.po @@ -3931,6 +3931,16 @@ msgstr "al" msgid "toggle-menu" msgstr "" +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/volto.pot b/locales/volto.pot index 02d328635..5f3e67311 100644 --- a/locales/volto.pot +++ b/locales/volto.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plone\n" -"POT-Creation-Date: 2024-03-25T16:36:34.513Z\n" +"POT-Creation-Date: 2024-03-27T13:23:48.779Z\n" "Last-Translator: Plone i18n \n" "Language-Team: Plone i18n \n" "MIME-Version: 1.0\n" @@ -3273,7 +3273,7 @@ msgid "search_startDate" msgstr "" #: helpers/Translations/searchBlockExtendedTranslations -# defaultMessage: Ricerca per: {searchedtext}. +# defaultMessage: Ricerca per: {searchedtext}. msgid "searchedFor" msgstr "" @@ -3933,6 +3933,16 @@ msgstr "" msgid "toggle-menu" msgstr "" +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index f7e2cc340..5457c94ae 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -100,8 +100,10 @@ const Navigation = ({ pathname }) => { { setCollapseOpen(!collapseOpen); @@ -179,6 +181,18 @@ const messages = defineMessages({ id: 'close-menu', defaultMessage: 'Chiudi menu', }, + toggleMenu: { + id: 'toggle-menu', + defaultMessage: '{action} il menu', + }, + toggleMenu_open: { + id: 'toggleMenu_open', + defaultMessage: 'Apri', + }, + toggleMenu_close: { + id: 'toggleMenu_close', + defaultMessage: 'Chiudi', + }, }); Navigation.propTypes = { diff --git a/src/overrideTranslations.jsx b/src/overrideTranslations.jsx index 392f2212e..633362aaa 100644 --- a/src/overrideTranslations.jsx +++ b/src/overrideTranslations.jsx @@ -48,8 +48,16 @@ defineMessages({ id: 'form_default_cancel_label', defaultMessage: 'Annulla', }, - ToggleMenu: { + toggleMenu: { id: 'toggle-menu', defaultMessage: '{action} il menu', }, + toggleMenu_open: { + id: 'toggleMenu_open', + defaultMessage: 'Apri', + }, + toggleMenu_close: { + id: 'toggleMenu_close', + defaultMessage: 'Chiudi', + }, }); From 0e8bbc2583eb0e2f8382a4c1468e80b9e1a93122 Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Wed, 3 Apr 2024 09:46:35 +0200 Subject: [PATCH 5/5] chore: resolved conflicts --- .../volto/components/theme/Navigation/Navigation.jsx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index b1d68466a..4550e9fed 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -100,15 +100,11 @@ const Navigation = ({ pathname }) => { >>>>>> main onClick={() => { setCollapseOpen(!collapseOpen); setFocusTrapActive(!focusTrapActive); @@ -193,7 +189,6 @@ const messages = defineMessages({ id: 'close-menu', defaultMessage: 'Chiudi menu', }, -<<<<<<< HEAD toggleMenu: { id: 'toggle-menu', defaultMessage: '{action} il menu', @@ -205,11 +200,6 @@ const messages = defineMessages({ toggleMenu_close: { id: 'toggleMenu_close', defaultMessage: 'Chiudi', -======= - toggleNavigation: { - id: 'toggle-navigation', - defaultMessage: 'Apri il menu', ->>>>>>> main }, });