diff --git a/lib/Alchemy/Phrasea/Command/Maintenance/CleanUsersCommand.php b/lib/Alchemy/Phrasea/Command/Maintenance/CleanUsersCommand.php index 04ee876b0d..deff1449c6 100644 --- a/lib/Alchemy/Phrasea/Command/Maintenance/CleanUsersCommand.php +++ b/lib/Alchemy/Phrasea/Command/Maintenance/CleanUsersCommand.php @@ -16,11 +16,11 @@ use Alchemy\Phrasea\Command\Command; use Alchemy\Phrasea\Core\LazyLocator; use Alchemy\Phrasea\Model\Entities\User; use Alchemy\Phrasea\Model\Manipulator\BasketManipulator; -use Alchemy\Phrasea\Model\Manipulator\TokenManipulator; use Alchemy\Phrasea\Model\Manipulator\UserManipulator; use Alchemy\Phrasea\Model\Repositories\BasketRepository; use Alchemy\Phrasea\Model\Repositories\UserRepository; use Alchemy\Phrasea\Notification\Mail\MailRequestInactifAccount; +use Alchemy\Phrasea\Notification\Mail\MailSuccessAccountInactifDelete; use Alchemy\Phrasea\Notification\Receiver; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -205,14 +205,14 @@ class CleanUsersCommand extends Command $nowDate->sub(new \DateInterval($interval)); $action = "in grace period"; - $validMail = true; + $isValidMail = true; if (!\Swift_Validate::email($user->getEmail())) { - $validMail = false; + $isValidMail = false; } if (empty($lastInactivityEmail) || $lastInactivityEmail < $nowDate) { // first, relance the user by email to have a grace period - if (($nbRelance < $maxRelances) && $validMail) { + if (($nbRelance < $maxRelances) && $isValidMail) { if (!$dry) { $this->relanceUser($user, $graceDuration); $user->setNbInactivityEmail($nbRelance+1); @@ -227,14 +227,15 @@ class CleanUsersCommand extends Command $baskets = $basketRepository->findBy(['user' => $user]); $this->getBasketManipulator()->removeBaskets($baskets); } - // delete user - $userManipulator->delete($user); + // delete user and notify by mail + $this->doDelete($user, $userManipulator, $isValidMail); + $output->write(sprintf("%s : %s / %s (%s)", $row['usr_id'], $row['login'], $row['email'], $row['last_connection'])); $output->writeln(" deleted."); } - if ($validMail) { + if ($isValidMail) { $action = sprintf("max_relances=%d , found %d times relanced (will be deleted if not --dry-run)", $maxRelances, $nbRelance); } else { $action = "no valid address email for the user (will be deleted if not --dry-run)"; @@ -274,10 +275,6 @@ class CleanUsersCommand extends Command private function relanceUser(User $user, $graceDuration) { try { - /** @var TokenManipulator $tokenManipulator */ - $tokenManipulator = $this->container['manipulator.token']; - $token = $tokenManipulator->create($user, TokenManipulator::TYPE_USER_RELANCE, new \DateTime("+{$graceDuration} day")); - $receiver = Receiver::fromUser($user); $mail = MailRequestInactifAccount::create($this->container, $receiver); @@ -292,6 +289,25 @@ class CleanUsersCommand extends Command } } + private function doDelete(User $user, UserManipulator $userManipulator, $validMail) + { + try { + if ($validMail) { + $receiver = Receiver::fromUser($user); + $mail = MailSuccessAccountInactifDelete::create($this->container, $receiver); + $mail->setLastConnection($user->getLastConnection()->format('Y-m-d')); + } + + $userManipulator->delete($user); + + if ($validMail) { + // return 0 on failure + $this->deliver($mail); + } + } catch (\Exception $e) { + } + } + /** * @return BasketManipulator */ diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php index 877bf24eff..875516d75a 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Manage.php +++ b/lib/Alchemy/Phrasea/Helper/User/Manage.php @@ -61,6 +61,7 @@ class Manage extends Helper 'filter_phantoms_only' => $this->request->get('filter_phantoms_only') ? true : false, 'filter_model_only' => $this->request->get('filter_model_only') ? true : false, 'filter_mail_locked_only' => $this->request->get('filter_mail_locked_only') ? true : false, + 'filter_grace_period_only' => $this->request->get('filter_grace_period_only') ? true : false, 'srt' => $request->get("srt", \User_Query::SORT_CREATIONDATE), 'ord' => $request->get("ord", \User_Query::ORD_DESC), 'offset_start' => $offset_start, @@ -79,6 +80,7 @@ class Manage extends Helper ->last_model_is($this->query_parms['last_model']) ->templates_only($this->query_parms['filter_model_only']) ->mail_locked_only($this->query_parms['filter_mail_locked_only']) + ->grace_period_only($this->query_parms['filter_grace_period_only']) ->get_inactives($this->query_parms['inactives']) ->include_templates(false) ->include_invite($this->query_parms['filter_guest_user']) @@ -111,6 +113,7 @@ class Manage extends Helper 'filter_phantoms_only' => $this->request->get('filter_phantoms_only') ? true : false, 'filter_model_only' => $this->request->get('filter_model_only') ? true : false, 'filter_mail_locked_only' => $this->request->get('filter_mail_locked_only') ? true : false, + 'filter_grace_period_only' => $this->request->get('filter_grace_period_only') ? true : false, 'srt' => $this->request->get("srt", \User_Query::SORT_CREATIONDATE), 'ord' => $this->request->get("ord", \User_Query::ORD_DESC), 'per_page' => $results_quantity, @@ -132,6 +135,7 @@ class Manage extends Helper ->get_inactives($this->query_parms['inactives']) ->templates_only($this->query_parms['filter_model_only']) ->mail_locked_only($this->query_parms['filter_mail_locked_only']) + ->grace_period_only($this->query_parms['filter_grace_period_only']) ->include_invite($this->query_parms['filter_guest_user']) ->phantoms_only($this->query_parms['filter_phantoms_only']) ->on_bases_where_i_am($this->app->getAclForUser($this->app->getAuthenticatedUser()), [\ACL::CANADMIN]) diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestInactifAccount.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestInactifAccount.php index bfcbac54be..dedf08f97f 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestInactifAccount.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestInactifAccount.php @@ -8,7 +8,9 @@ class MailRequestInactifAccount extends AbstractMail { private $login; + /** @var string */ private $lastConnection; + /** @var string */ private $deleteDate; public function setLogin($login) @@ -56,7 +58,7 @@ class MailRequestInactifAccount extends AbstractMail . "\n" . $this->app->trans("mail:: inactif account info with login %login% on application %application% is inactif since %lastConnection%", [ '%login%' => $this->login, - '%application%' => $this->getPhraseanetTitle(), + '%application%' => ''.$this->getPhraseanetTitle().'', '%lastConnection%' => $this->lastConnection, ], 'messages', $this->getLocale()) . "\n" . diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountInactifDelete.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountInactifDelete.php new file mode 100644 index 0000000000..6170da4cf1 --- /dev/null +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountInactifDelete.php @@ -0,0 +1,58 @@ +lastConnection = $lastConnection; + } + + /** + * @inheritDoc + */ + public function getSubject() + { + return $this->app->trans('mail:: account deletion confirmation object', [], 'messages', $this->getLocale()); + } + + /** + * @inheritDoc + */ + public function getMessage() + { + if (!$this->lastConnection) { + throw new LogicException('You must set a lastConnection before calling getMessage'); + } + + return + $this->app->trans("mail:: account deletion confirmation hello", [], 'messages', $this->getLocale()) + . "\n" . + $this->app->trans("mail::account deletion confirmation no activities since %lastConnection%", [ + '%lastConnection%' => $this->lastConnection + ], 'messages', $this->getLocale()) + . "\n" . + $this->app->trans("mail::account deletion confirmation account deleted", [], 'messages', $this->getLocale()) + ; + } + + /** + * @inheritDoc + */ + public function getButtonText() + { + } + + /** + * @inheritDoc + */ + public function getButtonURL() + { + } +} diff --git a/lib/classes/User/Query.php b/lib/classes/User/Query.php index 976e9ad481..7924640012 100644 --- a/lib/classes/User/Query.php +++ b/lib/classes/User/Query.php @@ -63,6 +63,7 @@ class User_Query protected $only_user_templates = false; protected $templates_only = false; protected $mail_locked_only = false; + protected $grace_period_only = false; protected $email_not_null = false; protected $base_ids = []; protected $sbas_ids = []; @@ -264,6 +265,20 @@ class User_Query return $this; } + /** + * Restrict only on grace period + * + * @param $boolean + * + * @return $this + */ + public function grace_period_only($boolean) + { + $this->grace_period_only = !!$boolean; + + return $this; + } + /** * Restrict to user with an email * @@ -1003,6 +1018,10 @@ class User_Query $sql .= ' AND mail_locked = 1'; } + if ($this->grace_period_only) { + $sql .= ' AND Users.nb_inactivity_email > 0 '; + } + if ($this->emailDomains) { $sql .= $this->generate_field_constraints('email', $this->emailDomains, 'LIKE'); } diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 804c38bca7..a7f243d1c2 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,14 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -154,9 +154,9 @@ %n_par_page% par page %n_par_page% pro Seite - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> ausgewählt]]> Controller/Prod/QueryController.php @@ -1024,7 +1024,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1166,7 +1166,7 @@ Apply a template Eine Schablone anwenden - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1200,7 +1200,7 @@ Are you sure you want delete users rights ? Sind Sie sicher, dass Sie die Benutzerzugriffe löschen möchten? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -2394,7 +2394,7 @@ Delete all users rights Alle Nutzerrechte löschen - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -2534,7 +2534,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen admin/fields/templates.html.twig @@ -3332,7 +3332,7 @@ Filter Filtern - web/admin/users.html.twig + web/admin/users.html.twig First Name @@ -3348,8 +3348,8 @@ First/Last Name Vorname / Nachname actions/Feedback/ListsMacros.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3985,7 +3985,7 @@ Last applied template letzte angewandte Vorlage - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4690,7 +4690,7 @@ None Keine Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -5064,7 +5064,7 @@ Please confirme the users deletion! Bitte bestätigen Sie die Löschung von Benutzern - web/admin/users.html.twig + web/admin/users.html.twig Please enter the databox name to reset or create @@ -5291,25 +5291,25 @@ Push::filter on companies Unternehmensname actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on countries Land actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on emails E-Mail actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on login Benutzername actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on name @@ -6825,7 +6825,7 @@ This is a template Hier ist eine Schablone - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6845,7 +6845,7 @@ This user has no rights Dieser Benutzer besitzt keine Rechte - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -8556,17 +8556,17 @@ admin::compte-utilisateur date de creation Erstellungsdatum - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur dernier modele applique Letzte angewendete Vorlage - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur derniere connexion Letzte Verbindung - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur email @@ -8574,7 +8574,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8591,7 +8591,7 @@ admin::compte-utilisateur id utilisateur Benutzername - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur identifiant @@ -8599,7 +8599,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig @@ -8636,7 +8636,7 @@ admin::compte-utilisateur pays Land Controller/Admin/UserController.php - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur poste @@ -8672,7 +8672,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -9082,12 +9082,12 @@ admin::userlist delete Ausgewählte Benutzer löschen - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist modify Ausgewählte Benutzer ändern - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist: display model only @@ -9104,6 +9104,11 @@ Benutzer ohne Rechte anzeigen web/admin/users.html.twig + + admin::userlist: user in grace period only + admin::userlist: user in grace period only + web/admin/users.html.twig + admin::userlist: user mail locked only Benutzer mit geblockter E-Mail anzeigen @@ -9269,57 +9274,57 @@ admin::users:filter: Date filter Nach Datum filtern - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: content enthält - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: created Erstellungsdatum - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: empty nicht ausgefüllt - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: finishing by endet mit - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: greater than nach - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: is null leer - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: last_connection Datum der letzten Verbindung - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: less than vor - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: start with beginnt mit - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: updated Aktualisierungsdatum - web/admin/users.html.twig + web/admin/users.html.twig admin::utilisateurs: bases de donnees @@ -10097,7 +10102,7 @@ WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -10105,12 +10110,12 @@ web/thesaurus/thesaurus.html.twig web/thesaurus/thesaurus.html.twig web/prod/index.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::choisir Auswählen - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -11515,36 +11520,56 @@ Mai classes/module/report.php + + mail:: account deletion confirmation hello + mail:: account deletion confirmation hello + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail:: account deletion confirmation object + mail:: account deletion confirmation object + Notification/Mail/MailSuccessAccountInactifDelete.php + mail:: inactif account mail:: inactif account - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account delete account info , account will be deleted on %deleteDate% mail:: inactif account delete account info , account will be deleted on %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account hello Hallo, - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account info with login %login% on application %application% is inactif since %lastConnection% Ihr Konto mit dem Login %login% in der Anwendung %application% wird seit dem %lastConnection% nicht mehr verwendet. - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account keep account info , connect before %deleteDate% Wenn Sie dieses Konto aktiv behalten möchten, müssen Sie vor dem %deleteDate% Anmeldung durchführen. - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: validation: Vote will expire on %expire% Das Feedback läuft am ab %expire% Notification/Mail/MailInfoValidationRequest.php + + mail::account deletion confirmation account deleted + mail::account deletion confirmation account deleted + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail::account deletion confirmation no activities since %lastConnection% + mail::account deletion confirmation no activities since %lastConnection% + Notification/Mail/MailSuccessAccountInactifDelete.php + mail::share Open with Lightbox Mit Lightbox öffnen @@ -12256,7 +12281,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden. web/account/account.html.twig @@ -14871,7 +14896,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben select at least one user Einen Benutzer auswählen - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15336,7 +15361,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig @@ -15906,7 +15931,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben users rights have been reseted Die Benutzerrechte wurden zurückgesetzt - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 1a4b70f9be..5f737630de 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -154,9 +154,9 @@ %n_par_page% par page %n_par_page% per page - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> selected]]> Controller/Prod/QueryController.php @@ -1025,7 +1025,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1167,7 +1167,7 @@ Apply a template Apply a template - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1201,7 +1201,7 @@ Are you sure you want delete users rights ? Are you sure you want to remove existing users rights? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -2397,7 +2397,7 @@ Delete all users rights Delete all users rights - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -2537,7 +2537,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings admin/fields/templates.html.twig @@ -3335,7 +3335,7 @@ Filter Filter - web/admin/users.html.twig + web/admin/users.html.twig First Name @@ -3351,8 +3351,8 @@ First/Last Name First/Last name actions/Feedback/ListsMacros.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3988,7 +3988,7 @@ Last applied template Applied user template - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4693,7 +4693,7 @@ None None Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -5067,7 +5067,7 @@ Please confirme the users deletion! Please confirm the users deletion ! - web/admin/users.html.twig + web/admin/users.html.twig Please enter the databox name to reset or create @@ -5294,25 +5294,25 @@ Push::filter on companies Company actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on countries Country actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on emails E-mail actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on login Login actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on name @@ -6828,7 +6828,7 @@ This is a template This is a template user - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6848,7 +6848,7 @@ This user has no rights This user has no rights - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -8559,17 +8559,17 @@ admin::compte-utilisateur date de creation Creation date - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur dernier modele applique Last applied template - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur derniere connexion Last connection - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur email @@ -8577,7 +8577,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8594,7 +8594,7 @@ admin::compte-utilisateur id utilisateur id - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur identifiant @@ -8602,7 +8602,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig @@ -8639,7 +8639,7 @@ admin::compte-utilisateur pays Country Controller/Admin/UserController.php - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur poste @@ -8675,7 +8675,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -9085,12 +9085,12 @@ admin::userlist delete Delete selected users - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist modify Modify selected users - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist: display model only @@ -9107,6 +9107,11 @@ Display users without rights web/admin/users.html.twig + + admin::userlist: user in grace period only + admin::userlist: user in grace period only + web/admin/users.html.twig + admin::userlist: user mail locked only Display users "email Locked" @@ -9272,57 +9277,57 @@ admin::users:filter: Date filter Filter by date - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: content contains - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: created Creation date - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: empty not filled - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: finishing by ending with - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: greater than after - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: is null empty - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: last_connection Last connection date - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: less than before - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: start with starts with - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: updated Update date - web/admin/users.html.twig + web/admin/users.html.twig admin::utilisateurs: bases de donnees @@ -10100,7 +10105,7 @@ WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -10108,12 +10113,12 @@ web/thesaurus/thesaurus.html.twig web/thesaurus/thesaurus.html.twig web/prod/index.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::choisir Choose - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -11518,36 +11523,56 @@ May classes/module/report.php + + mail:: account deletion confirmation hello + mail:: account deletion confirmation hello + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail:: account deletion confirmation object + mail:: account deletion confirmation object + Notification/Mail/MailSuccessAccountInactifDelete.php + mail:: inactif account Message about your account - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account delete account info , account will be deleted on %deleteDate% If you do not wish to keep this account, please ignore this email and your account will be automatically deleted on %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account hello Hello, - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account info with login %login% on application %application% is inactif since %lastConnection% Your account with the login %login% on application %application% has no longer been used since %lastConnection% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account keep account info , connect before %deleteDate% If you wish to keep this account active, you must login by %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: validation: Vote will expire on %expire% Feedback session expires on %expire% Notification/Mail/MailInfoValidationRequest.php + + mail::account deletion confirmation account deleted + mail::account deletion confirmation account deleted + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail::account deletion confirmation no activities since %lastConnection% + mail::account deletion confirmation no activities since %lastConnection% + Notification/Mail/MailSuccessAccountInactifDelete.php + mail::share Open with Lightbox Open with Lightbox @@ -12259,7 +12284,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface. web/account/account.html.twig @@ -14879,7 +14904,7 @@ It is possible to place several search areas select at least one user One user at least must be selected - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15344,7 +15369,7 @@ It is possible to place several search areas web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig @@ -15914,7 +15939,7 @@ It is possible to place several search areas users rights have been reseted Users rights have been reseted - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 26936ea6c1..3d88ca3fde 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -154,9 +154,9 @@ %n_par_page% par page %n_par_page% par page - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> sélectionnés]]> Controller/Prod/QueryController.php @@ -1024,7 +1024,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1166,7 +1166,7 @@ Apply a template Appliquer un modèle - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1200,7 +1200,7 @@ Are you sure you want delete users rights ? Etes-vous sûr de vouloir initialiser les droits des utilisateurs ? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -2394,7 +2394,7 @@ Delete all users rights Supprimer tous les droits de l'utilisateur - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -2534,7 +2534,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action admin/fields/templates.html.twig @@ -3332,7 +3332,7 @@ Filter Filtrer - web/admin/users.html.twig + web/admin/users.html.twig First Name @@ -3348,8 +3348,8 @@ First/Last Name Prénom / Nom actions/Feedback/ListsMacros.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3985,7 +3985,7 @@ Last applied template Dernier modèle appliqué - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4690,7 +4690,7 @@ None Aucun Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -5064,7 +5064,7 @@ Please confirme the users deletion! Merci de confirmer la suppression des utilisateurs - web/admin/users.html.twig + web/admin/users.html.twig Please enter the databox name to reset or create @@ -5291,25 +5291,25 @@ Push::filter on companies Société actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on countries Pays actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on emails E-mail actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on login Identifiant actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on name @@ -6825,7 +6825,7 @@ This is a template Ceci est un modèle - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6845,7 +6845,7 @@ This user has no rights Cet utilisateur ne possède aucun droit - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -8556,17 +8556,17 @@ admin::compte-utilisateur date de creation Création - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur dernier modele applique Dernier modèle appliqué - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur derniere connexion Dernière connexion - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur email @@ -8574,7 +8574,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8591,7 +8591,7 @@ admin::compte-utilisateur id utilisateur Id - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur identifiant @@ -8599,7 +8599,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig @@ -8636,7 +8636,7 @@ admin::compte-utilisateur pays Pays Controller/Admin/UserController.php - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur poste @@ -8672,7 +8672,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -9083,12 +9083,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::userlist delete Supprimer les utilisateurs sélectionnés - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist modify Editer les utilisateurs sélectionnés - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist: display model only @@ -9105,6 +9105,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Afficher les utilisateurs sans droits web/admin/users.html.twig + + admin::userlist: user in grace period only + admin::userlist: user in grace period only + web/admin/users.html.twig + admin::userlist: user mail locked only Afficher les utilisateurs ayant un email bloqué @@ -9270,57 +9275,57 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::users:filter: Date filter Filtrer par date - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: content Contient - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: created Date de création - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: empty non renseigné - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: finishing by finissant par - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: greater than après - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: is null vide - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: last_connection Date de dernière connexion - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: less than avant - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: start with Commence par - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: updated Date de mise à jour - web/admin/users.html.twig + web/admin/users.html.twig admin::utilisateurs: bases de donnees @@ -10098,7 +10103,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -10106,12 +10111,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/thesaurus/thesaurus.html.twig web/thesaurus/thesaurus.html.twig web/prod/index.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::choisir Choisir - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -11516,36 +11521,56 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le mai classes/module/report.php + + mail:: account deletion confirmation hello + mail:: account deletion confirmation hello + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail:: account deletion confirmation object + mail:: account deletion confirmation object + Notification/Mail/MailSuccessAccountInactifDelete.php + mail:: inactif account Message concernant votre compte - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account delete account info , account will be deleted on %deleteDate% Si vous ne souhaitez pas conserver votre compte, veuillez ne pas tenir compte de ce mail et il sera automatiquement supprimé le %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account hello Bonjour, - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account info with login %login% on application %application% is inactif since %lastConnection% Votre compte, ayant pour login %login% sur l'application %application% n'est plus utilisé depuis le %lastConnection% . - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account keep account info , connect before %deleteDate% Si vous souhaitez conserver ce compte actif, vous devez effectuer une connexion avant le %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: validation: Vote will expire on %expire% La validation expire le %expire% Notification/Mail/MailInfoValidationRequest.php + + mail::account deletion confirmation account deleted + mail::account deletion confirmation account deleted + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail::account deletion confirmation no activities since %lastConnection% + mail::account deletion confirmation no activities since %lastConnection% + Notification/Mail/MailSuccessAccountInactifDelete.php + mail::share Open with Lightbox Ouvrir avec Lightbox @@ -12257,7 +12282,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration. web/account/account.html.twig @@ -14880,7 +14905,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles select at least one user Sélectionner au moins un utilisateur - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15345,7 +15370,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig @@ -15915,7 +15940,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles users rights have been reseted Les droits utilisateurs ont été ré-initialisés - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 5a1fac80ba..d9a7ead970 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -154,9 +154,9 @@ %n_par_page% par page %n_par_page% per pagina - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -1025,7 +1025,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1167,7 +1167,7 @@ Apply a template Pas een sjabloon toe - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1201,7 +1201,7 @@ Are you sure you want delete users rights ? Bent u zeker om de gebruikersrechten te verwijderen? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -2397,7 +2397,7 @@ Delete all users rights Verwijder alle gebruikersrechten - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -3338,7 +3338,7 @@ Filter Filter - web/admin/users.html.twig + web/admin/users.html.twig First Name @@ -3354,8 +3354,8 @@ First/Last Name Voor/Achter naam actions/Feedback/ListsMacros.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3991,7 +3991,7 @@ Last applied template Laatst gebruikte template - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4696,7 +4696,7 @@ None Geen Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -5070,7 +5070,7 @@ Please confirme the users deletion! Please confirme the users deletion! - web/admin/users.html.twig + web/admin/users.html.twig Please enter the databox name to reset or create @@ -5297,25 +5297,25 @@ Push::filter on companies filter op bedrijven actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on countries filter op landen actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on emails filter op emails actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on login filter bij login actions/Feedback/list.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Push::filter on name @@ -6831,7 +6831,7 @@ This is a template Dit is een template - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6851,7 +6851,7 @@ This user has no rights Deze gebruiker heeft geen rechten - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -8562,17 +8562,17 @@ admin::compte-utilisateur date de creation Aanmaakdatum - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur dernier modele applique Laatst toegepast model - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur derniere connexion admin::compte-utilisateur derniere connexion - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur email @@ -8580,7 +8580,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8597,7 +8597,7 @@ admin::compte-utilisateur id utilisateur Gebruikersid - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur identifiant @@ -8605,7 +8605,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig @@ -8642,7 +8642,7 @@ admin::compte-utilisateur pays Land Controller/Admin/UserController.php - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur poste @@ -8678,7 +8678,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/users.html.twig + web/admin/users.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -9088,12 +9088,12 @@ admin::userlist delete admin::userlist delete - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist modify admin::userlist modify - web/admin/users.html.twig + web/admin/users.html.twig admin::userlist: display model only @@ -9110,6 +9110,11 @@ admin::userlist: phantoms only web/admin/users.html.twig + + admin::userlist: user in grace period only + admin::userlist: user in grace period only + web/admin/users.html.twig + admin::userlist: user mail locked only admin::userlist: user mail locked only @@ -9275,57 +9280,57 @@ admin::users:filter: Date filter admin::users:filter: Date filter - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: content admin::users:filter: content - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: created admin::users:filter: created - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: empty admin::users:filter: empty - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: finishing by admin::users:filter: finishing by - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: greater than admin::users:filter: greater than - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: is null admin::users:filter: is null - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: last_connection admin::users:filter: last_connection - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: less than admin::users:filter: less than - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: start with admin::users:filter: start with - web/admin/users.html.twig + web/admin/users.html.twig admin::users:filter: updated admin::users:filter: updated - web/admin/users.html.twig + web/admin/users.html.twig admin::utilisateurs: bases de donnees @@ -10103,7 +10108,7 @@ WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -10111,12 +10116,12 @@ web/thesaurus/thesaurus.html.twig web/thesaurus/thesaurus.html.twig web/prod/index.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::choisir kiezen - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -11521,36 +11526,56 @@ mei classes/module/report.php + + mail:: account deletion confirmation hello + mail:: account deletion confirmation hello + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail:: account deletion confirmation object + mail:: account deletion confirmation object + Notification/Mail/MailSuccessAccountInactifDelete.php + mail:: inactif account mail:: inactif account - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account delete account info , account will be deleted on %deleteDate% mail:: inactif account delete account info , account will be deleted on %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account hello mail:: inactif account hello - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account info with login %login% on application %application% is inactif since %lastConnection% mail:: inactif account info with login %login% on application %application% is inactif since %lastConnection% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: inactif account keep account info , connect before %deleteDate% mail:: inactif account keep account info , connect before %deleteDate% - Notification/Mail/MailRequestInactifAccount.php + Notification/Mail/MailRequestInactifAccount.php mail:: validation: Vote will expire on %expire% mail:: validation: Vote will expire on %expire% Notification/Mail/MailInfoValidationRequest.php + + mail::account deletion confirmation account deleted + mail::account deletion confirmation account deleted + Notification/Mail/MailSuccessAccountInactifDelete.php + + + mail::account deletion confirmation no activities since %lastConnection% + mail::account deletion confirmation no activities since %lastConnection% + Notification/Mail/MailSuccessAccountInactifDelete.php + mail::share Open with Lightbox mail::share Open with Lightbox @@ -14876,7 +14901,7 @@ select at least one user selecteer ten minste één gebruiker - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15911,7 +15936,7 @@ users rights have been reseted gebruikersrechten werden teruggezet - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index f9aad3b0b9..fd7230036b 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 172b47e8fc..a65437fe2d 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 4034e49a76..7154b96527 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 7c446ad543..f614820a44 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig index a235defd34..4fafcf9aff 100644 --- a/templates/web/admin/users.html.twig +++ b/templates/web/admin/users.html.twig @@ -49,6 +49,10 @@ {{ 'admin::userlist: user mail locked only' | trans }} +

{{ 'Filter' | trans }} + @@ -295,6 +300,7 @@ +