Skip to content

Commit

Permalink
Merge branch 'master' into typescript-support-in-core
Browse files Browse the repository at this point in the history 
* master:
  Update delete content modal for link integrity (#4786)
  • Loading branch information
@sneridagh
sneridagh committed Sep 18, 2023
2 parents c6a0488 + 5c3dbad commit 24f98cb
Show file tree
Hide file tree
Showing 20 changed files with 1,077 additions and 563 deletions.
2 changes: 1 addition & 1 deletion cypress/tests/core/basic/content.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ describe('Add Content Tests', () => {
cy.findByLabelText('/my-page').children('td').eq(1).click();

cy.get('.top-menu-menu .delete').click();
cy.get('.modal.active').contains('Potential link breakage');
cy.get('.modal.active').contains('View broken links list');
cy.get('.actions').contains('Delete').click();
});

Expand Down
85 changes: 55 additions & 30 deletions locales/ca/LC_MESSAGES/volto.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,11 +507,6 @@ msgstr "Navegueu pel lloc, deixeu anar una imatge o escriviu un URL"
msgid "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."
msgstr "Per defecte, els permisos del contenidor d'aquest element són heretats. Si es desactiva, només seran vàlids els permisos de compartició definits explícitament. A la vista general, el símbol ${inherited} indica un valor heretat. De la mateixa manera, el símbol ${global} indica un rol global, que és gestionat per l'administrador del lloc."

#: components/manage/Contents/Contents
# defaultMessage: By deleting this item, you will break links that exist in the items listed below. If this is indeed what you want to do, we recommend that remove these references first.
msgid "By deleting this item, you will break links that exist in the items listed below. If this is indeed what you want to do, we recommend that remove these references first."
msgstr ""

#: components/manage/Controlpanels/DatabaseInformation
# defaultMessage: Cache Name
msgid "Cache Name"
Expand Down Expand Up @@ -1004,6 +999,16 @@ msgstr ""
msgid "Delete row"
msgstr "Suprimeix la fila"

#: components/manage/Contents/Contents
# defaultMessage: Delete selected items?
msgid "Delete selected items?"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Delete this item?
msgid "Delete this item?"
msgstr ""

#: components/manage/Controlpanels/Rules/Rules
# defaultMessage: Deleted
msgid "Deleted"
Expand Down Expand Up @@ -1072,11 +1077,6 @@ msgstr "Distribuït sota la {license}."
msgid "Divide each row into separate cells"
msgstr "Afegeix una vora a les columnes interiors"

#: components/manage/Contents/Contents
# defaultMessage: Do you really want to delete the following items?
msgid "Do you really want to delete the following items?"
msgstr "Realment voleu suprimir els elements següents?"

#: components/manage/Controlpanels/Groups/GroupsControlpanel
# defaultMessage: Do you really want to delete the group {groupname}?
msgid "Do you really want to delete the group {groupname}?"
Expand Down Expand Up @@ -1873,11 +1873,6 @@ msgstr "Articles"
msgid "Items must be unique."
msgstr "Els articles han de ser únics."

#: components/manage/Contents/Contents
# defaultMessage: Items to be deleted:
msgid "Items to be deleted:"
msgstr ""

#: components/manage/Blocks/Search/schema
# defaultMessage: Label
msgid "Label"
Expand Down Expand Up @@ -2616,11 +2611,6 @@ msgstr ""
msgid "Possible values"
msgstr "Valors possibles (introduïu les opcions permeses una per línia)."

#: components/manage/Contents/Contents
# defaultMessage: Potential link breakage
msgid "Potential link breakage"
msgstr ""

#: components/theme/Footer/Footer
# defaultMessage: Powered by Plone & Python
msgid "Powered by Plone & Python"
Expand Down Expand Up @@ -3312,6 +3302,16 @@ msgstr "Mida: {size}"
msgid "Small"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Some items are also a folder.
msgid "Some items are also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Some items are referenced by other contents. By deleting them {brokenReferences} {variation} will be broken.
msgid "Some items are referenced by other contents. By deleting them {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/Controlpanels/Relations/Relations
# defaultMessage: Some relations are broken. Please fix.
msgid "Some relations are broken. Please fix."
Expand Down Expand Up @@ -3662,11 +3662,6 @@ msgstr "Hi va haver alguns errors."
msgid "Third"
msgstr "Tercer"

#: components/manage/Contents/Contents
# defaultMessage: This Page is referenced by the following items:
msgid "This Page is referenced by the following items:"
msgstr ""

#: components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory
# defaultMessage: This has an ongoing working copy in {title}
msgid "This has an ongoing working copy in {title}"
Expand All @@ -3682,6 +3677,16 @@ msgstr ""
msgid "This is a working copy of {title}"
msgstr "Aquesta és una còpia de treball de {title}"

#: components/manage/Contents/Contents
# defaultMessage: This item is also a folder.
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -3738,11 +3743,6 @@ msgstr "Total d'objectes actius i no actius"
msgid "Total comments"
msgstr "Total de comentaris"

#: components/manage/Contents/Contents
# defaultMessage: Total items to be deleted:
msgid "Total items to be deleted:"
msgstr ""

#: components/manage/Controlpanels/DatabaseInformation
# defaultMessage: Total number of objects in each cache
msgid "Total number of objects in each cache"
Expand Down Expand Up @@ -4095,6 +4095,11 @@ msgstr "URL del vídeo"
msgid "View"
msgstr "veure"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
Expand Down Expand Up @@ -4509,6 +4514,16 @@ msgstr "L'entrada ha de ser enter"
msgid "intranet"
msgstr "Intranet"

#: components/manage/Contents/Contents
# defaultMessage: item
msgid "item"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: items
msgid "items"
msgstr ""

#: components/theme/PasswordReset/RequestPasswordReset
# defaultMessage: My email is
msgid "label_my_email_is"
Expand Down Expand Up @@ -4638,6 +4653,16 @@ msgstr "Selecciona ..."
msgid "rebuild relations"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: reference
msgid "reference"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: references
msgid "references"
msgstr ""

#: components/theme/Search/Search
# defaultMessage: results
msgid "results found"
Expand Down
85 changes: 55 additions & 30 deletions locales/de/LC_MESSAGES/volto.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,11 +504,6 @@ msgstr "Seite durchsuchen, Bild ablegen oder URL eingeben"
msgid "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."
msgstr "Standardmäßig werden die Berechtigungen von einem Ordner auf die in ihm befindlichen Artikel vererbt. Wenn Sie dies deaktivieren, sind nur die explizit definierten Zugriffsberechtigungen gültig. In der Übersicht zeigt das Symbol ${image_confirm_icon} einen ererbten Wert an. Das Symbol ${image_link_icon} zeigt eine globale Funktion an, die vom Administrator verwaltet wird."

#: components/manage/Contents/Contents
# defaultMessage: By deleting this item, you will break links that exist in the items listed below. If this is indeed what you want to do, we recommend that remove these references first.
msgid "By deleting this item, you will break links that exist in the items listed below. If this is indeed what you want to do, we recommend that remove these references first."
msgstr "Wenn Sie dieses Element löschen, brechen Sie Links, welche in den unten gelisteten Elementen vorkommen. Wenn Sie das möchten, empfehlen wir, die Referenzen im Vorhinein zu löschen."

#: components/manage/Controlpanels/DatabaseInformation
# defaultMessage: Cache Name
msgid "Cache Name"
Expand Down Expand Up @@ -1001,6 +996,16 @@ msgstr "Löschbedingung"
msgid "Delete row"
msgstr "Zeile löschen"

#: components/manage/Contents/Contents
# defaultMessage: Delete selected items?
msgid "Delete selected items?"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Delete this item?
msgid "Delete this item?"
msgstr ""

#: components/manage/Controlpanels/Rules/Rules
# defaultMessage: Deleted
msgid "Deleted"
Expand Down Expand Up @@ -1069,11 +1074,6 @@ msgstr "Lizensiert unter der {license}."
msgid "Divide each row into separate cells"
msgstr "Zeile in zwei separate Zellen aufteilen"

#: components/manage/Contents/Contents
# defaultMessage: Do you really want to delete the following items?
msgid "Do you really want to delete the following items?"
msgstr "Möchten Sie den Artikel wirklich löschen?"

#: components/manage/Controlpanels/Groups/GroupsControlpanel
# defaultMessage: Do you really want to delete the group {groupname}?
msgid "Do you really want to delete the group {groupname}?"
Expand Down Expand Up @@ -1870,11 +1870,6 @@ msgstr "Elemente"
msgid "Items must be unique."
msgstr "Auswahl muss eindeutig sein."

#: components/manage/Contents/Contents
# defaultMessage: Items to be deleted:
msgid "Items to be deleted:"
msgstr "Zu löschende Elemente:"

#: components/manage/Blocks/Search/schema
# defaultMessage: Label
msgid "Label"
Expand Down Expand Up @@ -2613,11 +2608,6 @@ msgstr "Position geändert"
msgid "Possible values"
msgstr "Mögliche Werte"

#: components/manage/Contents/Contents
# defaultMessage: Potential link breakage
msgid "Potential link breakage"
msgstr "Potenziell werden Links ungültig"

#: components/theme/Footer/Footer
# defaultMessage: Powered by Plone & Python
msgid "Powered by Plone & Python"
Expand Down Expand Up @@ -3309,6 +3299,16 @@ msgstr "Grösse: {size}"
msgid "Small"
msgstr "Klein"

#: components/manage/Contents/Contents
# defaultMessage: Some items are also a folder.
msgid "Some items are also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Some items are referenced by other contents. By deleting them {brokenReferences} {variation} will be broken.
msgid "Some items are referenced by other contents. By deleting them {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/Controlpanels/Relations/Relations
# defaultMessage: Some relations are broken. Please fix.
msgid "Some relations are broken. Please fix."
Expand Down Expand Up @@ -3659,11 +3659,6 @@ msgstr "Es sind Fehler aufgetreten."
msgid "Third"
msgstr "Dritter"

#: components/manage/Contents/Contents
# defaultMessage: This Page is referenced by the following items:
msgid "This Page is referenced by the following items:"
msgstr "Diese Seite wird von folgenden Elementen referenziert:"

#: components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory
# defaultMessage: This has an ongoing working copy in {title}
msgid "This has an ongoing working copy in {title}"
Expand All @@ -3679,6 +3674,16 @@ msgstr "Dies ist ein reservierter Name und kann nicht verwendet werden"
msgid "This is a working copy of {title}"
msgstr "Das ist eine Arbeitskopie von {title}"

#: components/manage/Contents/Contents
# defaultMessage: This item is also a folder.
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -3735,11 +3740,6 @@ msgstr "Anzahl aktive und nicht-aktive Objekte"
msgid "Total comments"
msgstr "Anzahl Komentare"

#: components/manage/Contents/Contents
# defaultMessage: Total items to be deleted:
msgid "Total items to be deleted:"
msgstr ""

#: components/manage/Controlpanels/DatabaseInformation
# defaultMessage: Total number of objects in each cache
msgid "Total number of objects in each cache"
Expand Down Expand Up @@ -4092,6 +4092,11 @@ msgstr "Video URL"
msgid "View"
msgstr "Anzeigen"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
Expand Down Expand Up @@ -4506,6 +4511,16 @@ msgstr "Ganzzahl"
msgid "intranet"
msgstr "Intranet"

#: components/manage/Contents/Contents
# defaultMessage: item
msgid "item"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: items
msgid "items"
msgstr ""

#: components/theme/PasswordReset/RequestPasswordReset
# defaultMessage: My email is
msgid "label_my_email_is"
Expand Down Expand Up @@ -4635,6 +4650,16 @@ msgstr "Auswahl"
msgid "rebuild relations"
msgstr "Relationen neu indizieren"

#: components/manage/Contents/Contents
# defaultMessage: reference
msgid "reference"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: references
msgid "references"
msgstr ""

#: components/theme/Search/Search
# defaultMessage: results
msgid "results found"
Expand Down
Loading

0 comments on commit 24f98cb

Please sign in to comment.