From 9e312ed0b1a977bcc42a2e6a7d1b9406ae7fb605 Mon Sep 17 00:00:00 2001 From: David Glick Date: Fri, 2 Aug 2024 10:39:59 -0700 Subject: [PATCH] Remove unused i18n message (#6230) --- packages/volto/Makefile | 2 +- .../blocks/listing/blocks-listing-templates.js | 18 +++--------------- packages/volto/locales/ca/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/de/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/en/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/es/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/eu/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/fi/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/fr/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/hi/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/it/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/ja/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/nl/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/pt/LC_MESSAGES/volto.po | 5 ----- .../volto/locales/pt_BR/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/ro/LC_MESSAGES/volto.po | 5 ----- packages/volto/locales/volto.pot | 7 +------ .../volto/locales/zh_CN/LC_MESSAGES/volto.po | 5 ----- packages/volto/news/6230.bugfix | 1 + .../manage/Blocks/Search/components/SortOn.jsx | 4 ---- 20 files changed, 6 insertions(+), 101 deletions(-) create mode 100644 packages/volto/news/6230.bugfix diff --git a/packages/volto/Makefile b/packages/volto/Makefile index 39948f2749..79269d6505 100644 --- a/packages/volto/Makefile +++ b/packages/volto/Makefile @@ -155,7 +155,7 @@ deployment-acceptance-test: ## Start Cypress in interactive mode for tests in de .PHONY: deployment-acceptance-web-server-start deployment-acceptance-web-server-start: ## Start the reverse proxy (Traefik) in port 80 for deployment - cd cypress/docker && docker-compose -f seamless.yml up + cd cypress/docker && docker compose -f seamless.yml up .PHONY: deployment-ci-acceptance-test-run-all deployment-ci-acceptance-test-run-all: ## With a single command, run the backend, frontend, and the Cypress tests in headless mode for CI for deployment tests diff --git a/packages/volto/cypress/tests/core/blocks/listing/blocks-listing-templates.js b/packages/volto/cypress/tests/core/blocks/listing/blocks-listing-templates.js index 37af70bdcf..5de2f56cb5 100644 --- a/packages/volto/cypress/tests/core/blocks/listing/blocks-listing-templates.js +++ b/packages/volto/cypress/tests/core/blocks/listing/blocks-listing-templates.js @@ -34,11 +34,7 @@ describe('Folder Contents Tests', () => { cy.visit('/my-folder/my-document'); cy.get('.edit').click(); - cy.getSlate().click(); - cy.get('button.block-add-button').click(); - cy.get( - '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui', - ).click(); + cy.addNewBlock('listing'); cy.get('#field-variation').click().type('summary{enter}'); cy.get('#toolbar-save').click(); cy.wait('@content'); @@ -74,11 +70,7 @@ describe('Folder Contents Tests', () => { cy.visit('/my-folder/my-document'); cy.get('.edit').click(); - cy.getSlate().click(); - cy.get('button.block-add-button').click(); - cy.get( - '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui', - ).click(); + cy.addNewBlock('listing'); cy.get('#field-variation').click().type('summary{enter}'); cy.get('#toolbar-save').click(); cy.wait('@content'); @@ -116,11 +108,7 @@ describe('Folder Contents Tests', () => { cy.visit('/my-folder/my-document'); cy.get('.edit').click(); - cy.getSlate().click(); - cy.get('button.block-add-button').click(); - cy.get( - '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui', - ).click(); + cy.addNewBlock('listing'); cy.get('#field-variation').click().type('imageGallery{enter}'); cy.get('#toolbar-save').click(); cy.wait('@content'); diff --git a/packages/volto/locales/ca/LC_MESSAGES/volto.po b/packages/volto/locales/ca/LC_MESSAGES/volto.po index 882f8df983..9e0b5e8754 100644 --- a/packages/volto/locales/ca/LC_MESSAGES/volto.po +++ b/packages/volto/locales/ca/LC_MESSAGES/volto.po @@ -3414,11 +3414,6 @@ msgstr "Ordena" msgid "Sort on options" msgstr "Ordena les opcions" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/de/LC_MESSAGES/volto.po b/packages/volto/locales/de/LC_MESSAGES/volto.po index 1089694cd9..6bfbeeef7a 100644 --- a/packages/volto/locales/de/LC_MESSAGES/volto.po +++ b/packages/volto/locales/de/LC_MESSAGES/volto.po @@ -3413,11 +3413,6 @@ msgstr "Sortieren nach" msgid "Sort on options" msgstr "Sortieroptionen" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/en/LC_MESSAGES/volto.po b/packages/volto/locales/en/LC_MESSAGES/volto.po index 29f2346b6e..dd89217da3 100644 --- a/packages/volto/locales/en/LC_MESSAGES/volto.po +++ b/packages/volto/locales/en/LC_MESSAGES/volto.po @@ -3408,11 +3408,6 @@ msgstr "" msgid "Sort on options" msgstr "" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/es/LC_MESSAGES/volto.po b/packages/volto/locales/es/LC_MESSAGES/volto.po index 50bc4e1924..c3425875b0 100644 --- a/packages/volto/locales/es/LC_MESSAGES/volto.po +++ b/packages/volto/locales/es/LC_MESSAGES/volto.po @@ -3415,11 +3415,6 @@ msgstr "Ordenar por" msgid "Sort on options" msgstr "Ordenar por opciones" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/eu/LC_MESSAGES/volto.po b/packages/volto/locales/eu/LC_MESSAGES/volto.po index 6c145f58f7..903ab6ab45 100644 --- a/packages/volto/locales/eu/LC_MESSAGES/volto.po +++ b/packages/volto/locales/eu/LC_MESSAGES/volto.po @@ -3415,11 +3415,6 @@ msgstr "Ordenazioa" msgid "Sort on options" msgstr "Ordenatu aukeren arabera" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/fi/LC_MESSAGES/volto.po b/packages/volto/locales/fi/LC_MESSAGES/volto.po index 34a787d7b8..0d4e30e0a8 100644 --- a/packages/volto/locales/fi/LC_MESSAGES/volto.po +++ b/packages/volto/locales/fi/LC_MESSAGES/volto.po @@ -3413,11 +3413,6 @@ msgstr "Järjestys" msgid "Sort on options" msgstr "Lajittelun vaihtoehdot" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/fr/LC_MESSAGES/volto.po b/packages/volto/locales/fr/LC_MESSAGES/volto.po index f50775acbd..511169bdff 100644 --- a/packages/volto/locales/fr/LC_MESSAGES/volto.po +++ b/packages/volto/locales/fr/LC_MESSAGES/volto.po @@ -3415,11 +3415,6 @@ msgstr "Trier sur" msgid "Sort on options" msgstr "Options de tri" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/hi/LC_MESSAGES/volto.po b/packages/volto/locales/hi/LC_MESSAGES/volto.po index a6fc3900ed..a16f6ec8f9 100644 --- a/packages/volto/locales/hi/LC_MESSAGES/volto.po +++ b/packages/volto/locales/hi/LC_MESSAGES/volto.po @@ -3408,11 +3408,6 @@ msgstr "क्रमबद्ध करें द्वारा" msgid "Sort on options" msgstr "क्रमबद्ध करें द्वारा विकल्प" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/it/LC_MESSAGES/volto.po b/packages/volto/locales/it/LC_MESSAGES/volto.po index a00ed897bd..7affb80c3c 100644 --- a/packages/volto/locales/it/LC_MESSAGES/volto.po +++ b/packages/volto/locales/it/LC_MESSAGES/volto.po @@ -3408,11 +3408,6 @@ msgstr "Ordina per" msgid "Sort on options" msgstr "Opzioni di ordinamento" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/ja/LC_MESSAGES/volto.po b/packages/volto/locales/ja/LC_MESSAGES/volto.po index f6cd3cb259..63a0748be2 100644 --- a/packages/volto/locales/ja/LC_MESSAGES/volto.po +++ b/packages/volto/locales/ja/LC_MESSAGES/volto.po @@ -3413,11 +3413,6 @@ msgstr "ソート順" msgid "Sort on options" msgstr "" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/nl/LC_MESSAGES/volto.po b/packages/volto/locales/nl/LC_MESSAGES/volto.po index 567f561d6d..f56b22131d 100644 --- a/packages/volto/locales/nl/LC_MESSAGES/volto.po +++ b/packages/volto/locales/nl/LC_MESSAGES/volto.po @@ -3412,11 +3412,6 @@ msgstr "" msgid "Sort on options" msgstr "" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/pt/LC_MESSAGES/volto.po b/packages/volto/locales/pt/LC_MESSAGES/volto.po index 2c97866879..ab7df60445 100644 --- a/packages/volto/locales/pt/LC_MESSAGES/volto.po +++ b/packages/volto/locales/pt/LC_MESSAGES/volto.po @@ -3413,11 +3413,6 @@ msgstr "" msgid "Sort on options" msgstr "" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po b/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po index 1a322f378e..dd13938deb 100644 --- a/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po +++ b/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po @@ -3414,11 +3414,6 @@ msgstr "Ordenado por" msgid "Sort on options" msgstr "Opções de ordenação" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/ro/LC_MESSAGES/volto.po b/packages/volto/locales/ro/LC_MESSAGES/volto.po index ec596db862..62cc1b89ac 100644 --- a/packages/volto/locales/ro/LC_MESSAGES/volto.po +++ b/packages/volto/locales/ro/LC_MESSAGES/volto.po @@ -3408,11 +3408,6 @@ msgstr "Sortare pe" msgid "Sort on options" msgstr "Sortare pe opțiuni" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/volto.pot b/packages/volto/locales/volto.pot index 861418c388..b9df6cdeee 100644 --- a/packages/volto/locales/volto.pot +++ b/packages/volto/locales/volto.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plone\n" -"POT-Creation-Date: 2024-07-24T09:39:31.887Z\n" +"POT-Creation-Date: 2024-08-02T16:48:19.008Z\n" "Last-Translator: Plone i18n \n" "Language-Team: Plone i18n \n" "Content-Type: text/plain; charset=utf-8\n" @@ -3410,11 +3410,6 @@ msgstr "" msgid "Sort on options" msgstr "" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/locales/zh_CN/LC_MESSAGES/volto.po b/packages/volto/locales/zh_CN/LC_MESSAGES/volto.po index a2bfa17bbc..03009b30df 100644 --- a/packages/volto/locales/zh_CN/LC_MESSAGES/volto.po +++ b/packages/volto/locales/zh_CN/LC_MESSAGES/volto.po @@ -3414,11 +3414,6 @@ msgstr "排序" msgid "Sort on options" msgstr "根据选项排序" -#. Default: "Sort on {value}" -#: components/manage/Blocks/Search/components/SortOn -msgid "Sort on {value}" -msgstr "" - #. Default: "Sort transactions by User-Name, Path or Date" #: components/manage/Controlpanels/UndoControlpanel msgid "Sort transactions by User-Name, Path or Date" diff --git a/packages/volto/news/6230.bugfix b/packages/volto/news/6230.bugfix new file mode 100644 index 0000000000..7e8bc151cb --- /dev/null +++ b/packages/volto/news/6230.bugfix @@ -0,0 +1 @@ +Remove unused i18n message for SortOn component. @davisagli diff --git a/packages/volto/src/components/manage/Blocks/Search/components/SortOn.jsx b/packages/volto/src/components/manage/Blocks/Search/components/SortOn.jsx index de32097c3a..54a0730e6f 100644 --- a/packages/volto/src/components/manage/Blocks/Search/components/SortOn.jsx +++ b/packages/volto/src/components/manage/Blocks/Search/components/SortOn.jsx @@ -22,10 +22,6 @@ const messages = defineMessages({ id: 'Sort on', defaultMessage: 'Sort on', }, - sortOnButtonTitle: { - id: 'Sort on {value}', - defaultMessage: 'Sort on {value}', - }, ascending: { id: 'Ascending', defaultMessage: 'Ascending',