Skip to content

Commit

Permalink
Merge branch 'main' into registryesmandts
Browse files Browse the repository at this point in the history
* main:
  Test with plone.restapi 9.8.0 (#6430)
  Add German translations for URL management control panel (#6429)
  URL Management control panel: add Edit feature (#6425)
  Remove SEAMLESS mention in bootstrap (#6424)
  • Loading branch information
sneridagh committed Oct 24, 2024
2 parents 1f813ad + d8727ab commit 03fc1f0
Show file tree
Hide file tree
Showing 25 changed files with 407 additions and 328 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
describe('Add a new alias from control panel interface', () => {
describe('URL Management control panel', () => {
beforeEach(() => {
cy.intercept('GET', `/**/*?expand*`).as('content');
cy.autologin();
Expand All @@ -9,13 +9,28 @@ describe('Add a new alias from control panel interface', () => {
});
cy.visit('/my-page');
cy.wait('@content');

cy.visit('/controlpanel/aliases');
cy.get('#add-alt-url').click();
cy.get('#field-altUrlPath').type('/alturl');
cy.get('#field-targetUrlPath').type('/my-page');
cy.get('button[aria-label="Save"]').click();
});
it('adds a new alias', () => {
cy.get('.toast-inner-content').contains('Alias has been added');
});
it('edits an existing new alias', () => {
cy.visit('/controlpanel/aliases');
cy.get('#add-alt-url').click();
cy.get('#alternative-url-input').type('/alturl');
cy.get('#target-url-input').type('/my-page');
cy.get('#submit-alias').click();
cy.get('button[aria-label="Edit Alternative URL"]').click();
cy.get('#field-altUrlPath').clear().type('/alturl2');
cy.get('#field-targetUrlPath').clear().type('/my-page');
cy.get('button[aria-label="Save"]').click();
cy.get('.toast-inner-content').contains('Alias has been added');
});
it('removes an alias', () => {
cy.visit('/controlpanel/aliases');
cy.get('input[type="checkbox"][value="/alturl"]').click({ force: true });
cy.get('#remove-alt-urls').click();
cy.get('.toast-inner-content').contains('Aliases have been removed');
});
});
17 changes: 10 additions & 7 deletions packages/volto/locales/ca/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ msgstr ""

#. Default: "Add"
#: components/manage/Aliases/Aliases
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentTypes
#: components/manage/Controlpanels/Rules/ConfigureRule
#: components/manage/Rules/Rules
Expand Down Expand Up @@ -315,6 +314,11 @@ msgstr ""
msgid "Alias has been added"
msgstr ""

#. Default: "Aliases have been removed."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been removed."
msgstr ""

#. Default: "Aliases have been uploaded."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been uploaded."
Expand Down Expand Up @@ -546,7 +550,6 @@ msgstr "No es pot editar el disseny per al tipus de contingut <strong>{type}</st
#. Default: "Cancel"
#: components/manage/Add/Add
#: components/manage/Contents/ContentsUploadModal
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentType
#: components/manage/Controlpanels/ContentTypeLayout
#: components/manage/Controlpanels/ContentTypeSchema
Expand Down Expand Up @@ -1213,6 +1216,11 @@ msgstr "Les adreces de correu electrònic no coincideixen."
msgid "Edit"
msgstr "Edita"

#. Default: "Edit Alternative URL"
#: components/manage/Controlpanels/Aliases
msgid "Edit Alternative URL"
msgstr ""

#. Default: "Edit Rule"
#: components/manage/Controlpanels/Rules/EditRule
msgid "Edit Rule"
Expand Down Expand Up @@ -1381,11 +1389,6 @@ msgstr ""
msgid "Error"
msgstr "Error"

#. Default: "Error"
#: components/manage/Controlpanels/Aliases
msgid "ErrorHeader"
msgstr ""

#. Default: "Event"
#: components/manage/Controlpanels/Rules/Rules
msgid "Event"
Expand Down
33 changes: 18 additions & 15 deletions packages/volto/locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ msgstr "Aktivierte Inhaltsregeln auf dieser Seite"

#. Default: "Add"
#: components/manage/Aliases/Aliases
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentTypes
#: components/manage/Controlpanels/Rules/ConfigureRule
#: components/manage/Rules/Rules
Expand All @@ -96,7 +95,7 @@ msgstr "Hier werden verfügbare und installierte Backend-Add-ons gezeigt. Inform
#. Default: "Add Alternative URL"
#: components/manage/Controlpanels/Aliases
msgid "Add Alternative URL"
msgstr ""
msgstr "Quell URL hinzufügen"

#. Default: "Add Content…"
#: components/manage/Toolbar/Types
Expand Down Expand Up @@ -176,7 +175,7 @@ msgstr "Datum hinzufügen"
#. Default: "Add element to container"
#: components/manage/Blocks/Container/SimpleContainerToolbar
msgid "Add element to container"
msgstr ""
msgstr "Element zum Container hinzufügen"

#. Default: "Add field"
#: components/manage/Widgets/SchemaWidget
Expand Down Expand Up @@ -314,10 +313,15 @@ msgstr "Alias"
msgid "Alias has been added"
msgstr "Alias wurde hinzugefügt"

#. Default: "Aliases have been removed."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been removed."
msgstr "Weiterleitungen wurden entfernt."

#. Default: "Aliases have been uploaded."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been uploaded."
msgstr ""
msgstr "Weiterleitungen wurden hochgeladen."

#. Default: "Alignment"
#: components/manage/Blocks/Image/schema
Expand Down Expand Up @@ -420,7 +424,7 @@ msgstr "Aufsteigend"
#. Default: "Assign the {role} role to {entry}"
#: components/manage/Sharing/Sharing
msgid "Assign the {role} role to {entry}"
msgstr ""
msgstr "Rolle {role} zum {entry} zugewiesen."

#. Default: "Assignments"
#: components/manage/Controlpanels/Rules/ConfigureRule
Expand Down Expand Up @@ -515,7 +519,7 @@ msgstr "Seite durchsuchen, Bild ablegen oder URL eingeben"
#. Default: "Bulk upload CSV"
#: components/manage/Controlpanels/Aliases
msgid "BulkUploadAltUrls"
msgstr ""
msgstr "CSV Massenupload"

#. Default: "By default, permissions from the container of this item are inherited. If you disable this, only the explicitly defined sharing permissions will be valid. In the overview, the symbol {inherited} indicates an inherited value. Similarly, the symbol {global} indicates a global role, which is managed by the site administrator."
#: components/manage/Sharing/Sharing
Expand All @@ -525,7 +529,7 @@ msgstr "Standardmäßig werden die Berechtigungen von einem Ordner auf die in ih
#. Default: "CSV file"
#: components/manage/Controlpanels/Aliases
msgid "CSVFile"
msgstr ""
msgstr "CSV Datei"

#. Default: "Cache Name"
#: components/manage/Controlpanels/DatabaseInformation
Expand All @@ -545,7 +549,6 @@ msgstr "Layout für <strong>{type}</strong> kann nicht verändert werden, da das
#. Default: "Cancel"
#: components/manage/Add/Add
#: components/manage/Contents/ContentsUploadModal
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentType
#: components/manage/Controlpanels/ContentTypeLayout
#: components/manage/Controlpanels/ContentTypeSchema
Expand Down Expand Up @@ -1212,6 +1215,11 @@ msgstr "E-Mail-Adressen stimmen nicht überein."
msgid "Edit"
msgstr "Bearbeiten"

#. Default: "Edit Alternative URL"
#: components/manage/Controlpanels/Aliases
msgid "Edit Alternative URL"
msgstr "Quell URL bearbeiten"

#. Default: "Edit Rule"
#: components/manage/Controlpanels/Rules/EditRule
msgid "Edit Rule"
Expand Down Expand Up @@ -1331,7 +1339,7 @@ msgstr "Geben Sie den absoluten Pfad des Ziels ein. Das Ziel muss existieren ode
#. Default: "Enter the absolute path where the alternative URL should exist. The path must start with '/'. Only URLs that result in a 404 not found page will result in a redirect occurring."
#: components/manage/Controlpanels/Aliases
msgid "Enter the absolute path where the alternative url should exist. The path must start with '/'. Only URLs that result in a 404 not found page will result in a redirect occurring."
msgstr ""
msgstr "Geben Sie den absoluten Pfad an wo die Quell URL hinterlegt werden sollte. Der Pfad muss mit einem '/' beginnen. Nur URLs welche einen 404 (Not Found) Fehler auslösen werden weitergeleitet."

#. Default: "Enter the absolute path where the alternative url should exist. The path must start with '/'. Only urls that result in a 404 not found page will result in a redirect occurring."
#: components/manage/Aliases/Aliases
Expand Down Expand Up @@ -1362,7 +1370,7 @@ msgstr "Geben Sie Ihren Nutzernamen zur Verifikation ein."
#. Default: "Entries"
#: components/manage/Blocks/ToC/Schema
msgid "Entries"
msgstr ""
msgstr "Einträge"

#. Default: "Error"
#: components/manage/Add/Add
Expand All @@ -1380,11 +1388,6 @@ msgstr ""
msgid "Error"
msgstr "Fehler"

#. Default: "Error"
#: components/manage/Controlpanels/Aliases
msgid "ErrorHeader"
msgstr "Fehler"

#. Default: "Event"
#: components/manage/Controlpanels/Rules/Rules
msgid "Event"
Expand Down
17 changes: 10 additions & 7 deletions packages/volto/locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ msgstr ""

#. Default: "Add"
#: components/manage/Aliases/Aliases
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentTypes
#: components/manage/Controlpanels/Rules/ConfigureRule
#: components/manage/Rules/Rules
Expand Down Expand Up @@ -309,6 +308,11 @@ msgstr ""
msgid "Alias has been added"
msgstr ""

#. Default: "Aliases have been removed."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been removed."
msgstr ""

#. Default: "Aliases have been uploaded."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been uploaded."
Expand Down Expand Up @@ -540,7 +544,6 @@ msgstr ""
#. Default: "Cancel"
#: components/manage/Add/Add
#: components/manage/Contents/ContentsUploadModal
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentType
#: components/manage/Controlpanels/ContentTypeLayout
#: components/manage/Controlpanels/ContentTypeSchema
Expand Down Expand Up @@ -1207,6 +1210,11 @@ msgstr ""
msgid "Edit"
msgstr ""

#. Default: "Edit Alternative URL"
#: components/manage/Controlpanels/Aliases
msgid "Edit Alternative URL"
msgstr ""

#. Default: "Edit Rule"
#: components/manage/Controlpanels/Rules/EditRule
msgid "Edit Rule"
Expand Down Expand Up @@ -1375,11 +1383,6 @@ msgstr ""
msgid "Error"
msgstr ""

#. Default: "Error"
#: components/manage/Controlpanels/Aliases
msgid "ErrorHeader"
msgstr ""

#. Default: "Event"
#: components/manage/Controlpanels/Rules/Rules
msgid "Event"
Expand Down
17 changes: 10 additions & 7 deletions packages/volto/locales/es/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ msgstr "Reglas de contenido activas en esta página"

#. Default: "Add"
#: components/manage/Aliases/Aliases
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentTypes
#: components/manage/Controlpanels/Rules/ConfigureRule
#: components/manage/Rules/Rules
Expand Down Expand Up @@ -316,6 +315,11 @@ msgstr "Alias"
msgid "Alias has been added"
msgstr "Alias añadido correctamente"

#. Default: "Aliases have been removed."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been removed."
msgstr ""

#. Default: "Aliases have been uploaded."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been uploaded."
Expand Down Expand Up @@ -547,7 +551,6 @@ msgstr "No se puede editar la plantilla de <strong>{type}</strong> porque el sop
#. Default: "Cancel"
#: components/manage/Add/Add
#: components/manage/Contents/ContentsUploadModal
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentType
#: components/manage/Controlpanels/ContentTypeLayout
#: components/manage/Controlpanels/ContentTypeSchema
Expand Down Expand Up @@ -1214,6 +1217,11 @@ msgstr "La dirección de correo electrónico no coincide."
msgid "Edit"
msgstr "Editar"

#. Default: "Edit Alternative URL"
#: components/manage/Controlpanels/Aliases
msgid "Edit Alternative URL"
msgstr ""

#. Default: "Edit Rule"
#: components/manage/Controlpanels/Rules/EditRule
msgid "Edit Rule"
Expand Down Expand Up @@ -1382,11 +1390,6 @@ msgstr "Entradas"
msgid "Error"
msgstr "Error"

#. Default: "Error"
#: components/manage/Controlpanels/Aliases
msgid "ErrorHeader"
msgstr "Error"

#. Default: "Event"
#: components/manage/Controlpanels/Rules/Rules
msgid "Event"
Expand Down
17 changes: 10 additions & 7 deletions packages/volto/locales/eu/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ msgstr "Orrialde honetan aktibo dauden eduki-erregelak"

#. Default: "Add"
#: components/manage/Aliases/Aliases
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentTypes
#: components/manage/Controlpanels/Rules/ConfigureRule
#: components/manage/Rules/Rules
Expand Down Expand Up @@ -316,6 +315,11 @@ msgstr "Aliasa"
msgid "Alias has been added"
msgstr "Aliasa ondo gehitu da"

#. Default: "Aliases have been removed."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been removed."
msgstr ""

#. Default: "Aliases have been uploaded."
#: components/manage/Controlpanels/Aliases
msgid "Aliases have been uploaded."
Expand Down Expand Up @@ -547,7 +551,6 @@ msgstr "Ezin da <strong>{type}</strong> elementu-motaren itxura aldatu, <strong>
#. Default: "Cancel"
#: components/manage/Add/Add
#: components/manage/Contents/ContentsUploadModal
#: components/manage/Controlpanels/Aliases
#: components/manage/Controlpanels/ContentType
#: components/manage/Controlpanels/ContentTypeLayout
#: components/manage/Controlpanels/ContentTypeSchema
Expand Down Expand Up @@ -1214,6 +1217,11 @@ msgstr "Eposta helbideak ez datoz bat"
msgid "Edit"
msgstr "Editatu"

#. Default: "Edit Alternative URL"
#: components/manage/Controlpanels/Aliases
msgid "Edit Alternative URL"
msgstr ""

#. Default: "Edit Rule"
#: components/manage/Controlpanels/Rules/EditRule
msgid "Edit Rule"
Expand Down Expand Up @@ -1382,11 +1390,6 @@ msgstr ""
msgid "Error"
msgstr "Erroea"

#. Default: "Error"
#: components/manage/Controlpanels/Aliases
msgid "ErrorHeader"
msgstr "Errorea"

#. Default: "Event"
#: components/manage/Controlpanels/Rules/Rules
msgid "Event"
Expand Down
Loading

0 comments on commit 03fc1f0

Please sign in to comment.