Skip to content

Commit ce584bb

Browse files
committed
Merge branch 'master' into magento2.4.x
2 parents 4773d85 + a98223c commit ce584bb

8 files changed

+110
-58
lines changed

Api/ActionEntityRepositoryInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsI
5353
*
5454
* @param ActionEntityInterface $actionEntity
5555
* @return bool true on success
56-
* @throws NoSuchEntityException
5756
* @throws CouldNotDeleteException
5857
*/
5958
public function delete(ActionEntityInterface $actionEntity): bool;

Api/EraseEntityRepositoryInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsI
6363
*
6464
* @param EraseEntityInterface $eraseEntity
6565
* @return bool true on success
66-
* @throws NoSuchEntityException
6766
* @throws CouldNotDeleteException
6867
*/
6968
public function delete(EraseEntityInterface $eraseEntity): bool;

Api/ExportEntityRepositoryInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsI
6363
*
6464
* @param ExportEntityInterface $exportEntity
6565
* @return bool true on success
66-
* @throws NoSuchEntityException
6766
* @throws CouldNotDeleteException
6867
*/
6968
public function delete(ExportEntityInterface $exportEntity): bool;

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
},
2828
"require-dev": {
2929
"magento/magento-coding-standard": "^5",
30+
"magento/marketplace-eqp": "^4.0",
3031
"roave/security-advisories": "dev-master"
3132
},
3233
"type": "magento2-module",

i18n/en_US.csv

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Processor,Processor
1616
GDPR,GDPR
1717
"Please correct the data sent.","Please correct the data sent."
1818
"Action with ID ""%1"": %2","Action with ID ""%1"": %2"
19+
"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
1920
"Execute New Action","Execute New Action"
2021
"You erased the order.","You erased the order."
2122
"You erased the customer.","You erased the customer."
@@ -28,6 +29,7 @@ GDPR,GDPR
2829
"A document is already available in your order page.","A document is already available in your order page."
2930
"You canceled your personal data deletion.","You canceled your personal data deletion."
3031
"Your account is already being removed.","Your account is already being removed."
32+
"The session initialization has failed.","The session initialization has failed."
3133
"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
3234
"A document is already available in your account.","A document is already available in your account."
3335
"You canceled your account deletion.","You canceled your account deletion."
@@ -60,7 +62,6 @@ Information,Information
6062
"%name,","%name,"
6163
"We have received a request to cancel the erasure of the information associated with your account at %store_name.","We have received a request to cancel the erasure of the information associated with your account at %store_name."
6264
"If you have not authorized this action, please contact us immediately at <a href=""mailto:%store_email"">%store_email</a>","If you have not authorized this action, please contact us immediately at <a href=""mailto:%store_email"">%store_email</a>"
63-
"or call us at <a href=""tel:%store_phone"">%store_phone</a>","or call us at <a href=""tel:%store_phone"">%store_phone</a>"
6465
"Thanks,<br>%store_name","Thanks,<br>%store_name"
6566
"Erase your %store_name information","Erase your %store_name information"
6667
"We have received a request to erase the information associated with your account at %store_name.","We have received a request to erase the information associated with your account at %store_name."
@@ -81,12 +82,16 @@ Accept,Accept
8182
"GDPR Actions","GDPR Actions"
8283
"Execute Actions","Execute Actions"
8384
"Edit Actions","Edit Actions"
84-
"Cancel Actions","Cancel Actions"
85+
"Delete Actions","Delete Actions"
8586
"GDPR Compliance Section","GDPR Compliance Section"
86-
Actions,Actions
87+
"Action Logs","Action Logs"
8788
"GDPR Compliance","GDPR Compliance"
89+
"User Action","User Action"
8890
"Action Settings","Action Settings"
91+
"Cookie Policy","Cookie Policy"
8992
"Cookie Settings","Cookie Settings"
93+
"It will enable the cookie disclosure popin to the storefront.","It will enable the cookie disclosure popin to the storefront."
94+
"Data Erasure","Data Erasure"
9095
"Right To Erasure","Right To Erasure"
9196
Erasure,Erasure
9297
"It will enable the erase action to the storefront.","It will enable the erase action to the storefront."
@@ -124,14 +129,15 @@ Anonymization,Anonymization
124129
"Order Address Custom Attributes Anonymizers","Order Address Custom Attributes Anonymizers"
125130
"Order Address Extensible Data Anonymizers","Order Address Extensible Data Anonymizers"
126131
"Subscriber Attributes Anonymizers","Subscriber Attributes Anonymizers"
132+
"Data Export","Data Export"
127133
"Export Settings","Export Settings"
128134
Export,Export
129135
"It will enable the export action to the storefront.","It will enable the export action to the storefront."
130136
Renderers,Renderers
131137
"Select formats of the export. Notice: At least one human and one machine readable format should be selected.","Select formats of the export. Notice: At least one human and one machine readable format should be selected."
132138
"Export File Name","Export File Name"
133139
"We will use this value as file name of the document export.","We will use this value as file name of the document export."
134-
"Export Schedule","Export Schedule"
140+
"Export Scheduler","Export Scheduler"
135141
"Export Life Time","Export Life Time"
136142
"Export life time in minute before it is removed from the server.","Export life time in minute before it is removed from the server."
137143
"Erase Expired Export Schedule","Erase Expired Export Schedule"
@@ -157,10 +163,13 @@ Comma-separated,Comma-separated
157163
"Order Address Custom Attributes","Order Address Custom Attributes"
158164
"Order Address Extensible Data","Order Address Extensible Data"
159165
"Subscriber Attributes","Subscriber Attributes"
166+
Global,Global
160167
General,General
161168
Enabled,Enabled
169+
"It will enable the module features in the admin and frontend ui.","It will enable the module features in the admin and frontend ui."
162170
"Information page","Information page"
163171
"This page should store information about privacy and GDPR policy.","This page should store information about privacy and GDPR policy."
172+
"User Notification","User Notification"
164173
Notification,Notification
165174
"Pending Action","Pending Action"
166175
"Email Sender","Email Sender"
@@ -175,7 +184,6 @@ Notification,Notification
175184
"Canceled Action","Canceled Action"
176185
"Canceled Erasure Template","Canceled Erasure Template"
177186
"Canceled Erasure Template for Guest","Canceled Erasure Template for Guest"
178-
"Export Mail Notification","Export Mail Notification"
179187
"Pending Export Template","Pending Export Template"
180188
"Pending Export Template for Guest","Pending Export Template for Guest"
181189
"Ready Action","Ready Action"
@@ -195,6 +203,9 @@ Parameters,Parameters
195203
Name,Name
196204
Value,Value
197205
Edit,Edit
206+
"Are you sure you want to delete the action log?","Are you sure you want to delete the action log?"
207+
"Delete items","Delete items"
208+
Delete,Delete
198209
ID,ID
199210
"Performed From","Performed From"
200211
"Performed By","Performed By"

i18n/fr_FR.csv

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
"Back","Retour"
2+
"Execute Action","Exécuter l'action"
3+
"Reset","Réinitialiser"
14
"Attribute Code","Code d'attribut"
25
"Anonymizer","Anonymiseur"
36
"Add Attribute's Anonymizer","Ajouter un anonymiseur d'attribut"
@@ -7,45 +10,65 @@
710
"Erase Personal Data","Effacer les données personnelles"
811
"Are you sure you want to do this?","Êtes-vous sûr de vouloir faire cette action?"
912
"Export Personal Data","Exporter les données personnelles"
10-
"You erased the order.","Vous avez effacé la commande."
13+
"The action state is now: %1.","L'action est maintenant: %1."
1114
"An error occurred on the server.","Une erreur est survenue sur le serveur."
15+
"View Actions","Voir les actions"
16+
"GDPR","RGPD"
17+
"Please correct the data sent.","Veuillez corriger les données envoyés."
18+
"Action with ID ""%1"": %2","Action avec l'ID ""%1"": %2"
19+
"Execute New Action","Exécuter une nouvelle action"
20+
"You erased the order.","Vous avez effacé la commande."
1221
"You erased the customer.","Vous avez effacé le client."
1322
"Customer with id ""%1"": %2","Client avec l'id ""%1"": %2"
1423
"A total of %1 record(s) were erased.","Un total de %1 enregistrement(s) ont été effacé(s)."
15-
"Your personal data is being removed soon.","Vos données personnelles vont être bientôt supprimées."
24+
"The document does not exists and may have expired. Please renew your demand.","Le document n'existe pas ou peut être expiré. Veuillez renouveler votre demande."
1625
"Something went wrong, please try again later!","Quelque chose ne s'est pas bien passé, essayez à nouveau plus tard !"
26+
"Your personal data is being removed soon.","Vos données personnelles vont être bientôt supprimées."
27+
"You will be notified when the export is ready.","Vous serez notifié lorsque l'export sera prêt."
28+
"A document is already available in your order page.","Un document est déjà disponible sur votre historique de commande."
1729
"You canceled your personal data deletion.","Vous avez annulé la supression de vos données personelles."
1830
"Your account is already being removed.","Votre compte est déjà en cours de suppression."
1931
"You did not sign in correctly or your account is temporarily disabled.","Vous ne vous êtes pas correctement identifié ou votre compte a été temporairement désactivé."
32+
"A document is already available in your account.","Un document est déjà disponible dans votre espace personnel."
2033
"You canceled your account deletion.","Vous avez annulé la suppression de votre compte."
34+
"Could not save the entity.","Impossible de sauvegarder l'entité."
35+
"Could not delete entity with id ""%1"".","Impossible de supprimer l'entité avec l'id ""%1""."
2136
"File ""%1"" does not exists.","Le fichier ""%1"" n'existe pas."
37+
"Succeeded","Succès"
38+
"Failed","Raté"
2239
"Impossible to initiate the erasure, it's already processing or there is still pending orders.","Impossible d'initier l'effacement, une demande est déjà en cours ou il existe des commandes en cours."
2340
"The erasure process is running and cannot be undone.","Le processus d'effacement est en cours et ne peut pas être annulé."
2441
"Impossible to process the erasure, there is still pending orders.","Impossible de procéder à l'effacement, il existe des commandes en cours."
25-
"Could not save the entity.","Impossible de sauvegarder l'entité."
26-
"Entity with id ""%1"" does not exists.","L'entité avec l'id ""%1"" n'existe pas."
27-
"Entity with customer id ""%1"" does not exist.","L'entité client avec l'id ""%1"" n'existe pas."
28-
"Could not delete entity with id ""%1"".","Impossible de supprimer l'entité avec l'id ""%1""."
42+
"Impossible to process the erasure: %1","Impossible de traiter l'effacement: %1"
43+
"An export entity already exists for the entity type ""%1"" with ID ""%2"".","Une entité d'export existe déjà pour le type d'entité ""%1"" avec l'ID ""%2""."
44+
"State ""%1"" does not exists.","L'état ""%1"" n'existe pas."
2945
"* Required Fields","* Champs requis"
3046
"Confirm password to continue","Confirmer le mot de passe avant de continuer"
3147
"Password","Mot de passe"
3248
"Erase Account","Effacer le compte"
33-
"Back","Retour"
3449
"Warning","Attention"
3550
"Do you really want to erase your personal data?","Voulez-vous vraiment oublier vos données personnelles?"
3651
"Right to be forgotten","Droit à l'oubli"
3752
"Your account will be erased soon. You can undo this action.","Votre compte sera effacé sous peu. Vous pouvez annuler cette action."
3853
"Undo Action","Annuler l'action"
3954
"Your account cannot be erased while you have pending orders.","Votre compte ne peut pas être effacé tant que vous avez des commandes en cours."
55+
"Download Personal Data","Télécharger les données personnelles"
56+
"Your personal data document is pending export.","Vos données personnelles sont en attente d'export."
4057
"Information","Information"
4158
"Undo Erase Personal Data","Annuler l'effacement des données personnelles"
59+
"Cancellation of the erase of your %store_name information","Annulation de la demande d'effacement de vos données pour %store_name"
60+
"%name,","%name,"
61+
"We have received a request to cancel the erasure of the information associated with your account at %store_name.","Nous avons reçus une demande d'annulation pour l'effacement de vos données associés à votre compte sur %store_name."
62+
"If you have not authorized this action, please contact us immediately at <a href=""mailto:%store_email"">%store_email</a>","Si vous n'avez pas autorisé cette action, veuillez nous contacter immédiatement à <a href=""mailto:%store_email"">%store_email</a>"
63+
"Thanks,<br>%store_name","Merci, <br>%store_name"
64+
"Erase your %store_name information","Effacer vos données de %store_name"
4265
"Cookie Disclosure","Déclaration de cookie"
4366
"Read More","Lire plus"
4467
"Accept","Accepter"
4568
"GDPR Compliance Erase Customer","Conformité RGPD: Effacer le client"
4669
"GDPR Compliance Export Customer","Conformité RGPD: Exporter le client"
47-
"GDPR Compliance Erase Guest Order","Conformité RGPD: Effacer le compte invité"
48-
"GDPR Compliance Export Guest Order","Conformité RGPD: Exporter le compte invité"
70+
"GDPR Compliance Erase Guest Order","Conformité RGPD: Effacer l'invité"
71+
"GDPR Compliance Export Guest Order","Conformité RGPD: Exporter l'invité"
4972
"GDPR Compliance Section","Section sur la conformité RGPD"
5073
"GDPR Compliance","Conformité RGPD"
5174
"Cookie Settings","Paramètres sur les cookies"
@@ -89,12 +112,10 @@
89112
"Export Settings","Paramètres d'export"
90113
"Export","Export"
91114
"It will enable the export action to the storefront.","Ceci activera l'action d'exporter sur la vue client."
92-
"Renderer","Moteur de rendu"
93115
"Customer","Client"
94116
"Customer Attributes","Attributs client"
95117
"This attributes list will be exported when processed.","Cette liste d'attributs sera exportée quand éxécutée."
96118
"Customer Custom Attributes","Attributs personnalisés d'un client"
97-
"Attributes must be separated with comma.","Les attributs doivent être séparés par des virgules."
98119
"Customer Extensible Data","Données extensible d'un client"
99120
"Customer Address Attributes","Attributs d'une adresse de client"
100121
"Customer Address Custom Attributes","Attributs personnalisés d'une adresse de client"
@@ -122,3 +143,17 @@
122143
"Are you sure you want to export the selected customers?","Êtes-vous sûr de vouloir exporter le(s) client(s) sélectionné(s) ?"
123144
"Export items","Exporter les éléments"
124145
"Export (GDPR)","Export (RGPD)"
146+
"New Action","Nouvelle action"
147+
"Type","Type"
148+
"Action types are registered in the code.","Les types d'actions sont déclarés dans le code."
149+
"Parameters","Paramètres"
150+
"Add Parameter","Ajouter un paramètre"
151+
"Name","Nom"
152+
"Value","Valeur"
153+
"Edit","Editer"
154+
"ID","ID"
155+
"Performed From","Effectué depuis"
156+
"Performed By","Effectué par"
157+
"Performed At","Effectué à"
158+
"State","Etat"
159+
"Message","Message"

0 commit comments

Comments
 (0)