diff --git a/lib/Alchemy/Phrasea/Controller/Admin/UserController.php b/lib/Alchemy/Phrasea/Controller/Admin/UserController.php index 3e02c1cf19..91cff90a6d 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/UserController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/UserController.php @@ -169,7 +169,8 @@ class UserController extends Controller 'Fax', 'Job', 'Company', - 'Position' + 'Position', + 'Last Connection' ] ]; @@ -190,7 +191,8 @@ class UserController extends Controller $user->getFax(), $user->getJob(), $user->getCompany(), - $user->getActivity() + $user->getActivity(), + $this->getUserLastConnection($user) ]; } @@ -941,6 +943,10 @@ class UserController extends Controller ]; } + private function getUserLastConnection(User $user) + { + return ($user->getLastConnection() != null) ? $user->getLastConnection()->format(DATE_ATOM): ''; + } /** * @param Request $request * @return UserHelper\Edit diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php index f12e04993a..ab1e04d223 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Manage.php +++ b/lib/Alchemy/Phrasea/Helper/User/Manage.php @@ -50,6 +50,7 @@ class Manage extends Helper $this->query_parms = [ 'inactives' => $request->get('inactives'), 'like_field' => $request->get('like_field'), + 'like_type' => $this->request->get('like_type'), 'like_value' => $request->get('like_value'), 'sbas_id' => $request->get('sbas_id'), 'base_id' => $request->get('base_id'), @@ -59,6 +60,7 @@ class Manage extends Helper 'offset_start' => $offset_start, ]; + /** @var \User_Query $query */ $query = $this->app['phraseanet.user-query']; if (is_array($this->query_parms['base_id'])) @@ -67,7 +69,7 @@ class Manage extends Helper $query->on_sbas_ids($this->query_parms['sbas_id']); $results = $query->sort_by($this->query_parms["srt"], $this->query_parms["ord"]) - ->like($this->query_parms['like_field'], $this->query_parms['like_value']) + ->like($this->query_parms['like_field'], $this->query_parms['like_value'], $this->query_parms['like_type']) ->last_model_is($this->query_parms['last_model']) ->get_inactives($this->query_parms['inactives']) ->include_templates(false) diff --git a/lib/classes/User/Query.php b/lib/classes/User/Query.php index 0405feddff..188da60520 100644 --- a/lib/classes/User/Query.php +++ b/lib/classes/User/Query.php @@ -39,6 +39,8 @@ class User_Query const LIKE_MATCH_OR = 'OR'; const LIKE_TYPE_START = 'like_start'; const LIKE_TYPE_CONTAINS = 'like_contains'; + const LIKE_TYPE_FINISH = 'like_finish'; + const LIKE_TYPE_EMPTY = 'like_empty'; protected $app; protected $results = []; @@ -1008,7 +1010,15 @@ class User_Query , self::LIKE_LASTNAME , str_replace(['"', '%'], ['\"', '\%'], $like_val) ); - } else { + } elseif ($this->like_type == self::LIKE_TYPE_FINISH) { + $queries[] = sprintf( + ' (Users.`%s` LIKE "%%%s" COLLATE utf8_unicode_ci OR Users.`%s` LIKE "%%%s" COLLATE utf8_unicode_ci) ' + , self::LIKE_FIRSTNAME + , str_replace(['"', '%'], ['\"', '\%'], $like_val) + , self::LIKE_LASTNAME + , str_replace(['"', '%'], ['\"', '\%'], $like_val) + ); + } elseif ($this->like_type == self::LIKE_TYPE_START) { $queries[] = sprintf( ' (Users.`%s` LIKE "%s%%" COLLATE utf8_unicode_ci OR Users.`%s` LIKE "%s%%" COLLATE utf8_unicode_ci) ' , self::LIKE_FIRSTNAME @@ -1017,7 +1027,16 @@ class User_Query , str_replace(['"', '%'], ['\"', '\%'], $like_val) ); } + } + if ($this->like_type == self::LIKE_TYPE_EMPTY) { + $queries[] = sprintf( + ' ((Users.`%s` is NULL OR Users.`%s` = "") AND (Users.`%s` is NULL OR Users.`%s` = "")) ' + , self::LIKE_FIRSTNAME + , self::LIKE_FIRSTNAME + , self::LIKE_LASTNAME + , self::LIKE_LASTNAME + ); } if (count($queries) > 0) { @@ -1036,6 +1055,18 @@ class User_Query , $like_field , str_replace(['"', '%'], ['\"', '\%'], $like_value) ); + } elseif ($this->like_type == self::LIKE_TYPE_FINISH) { + $sql_like[] = sprintf( + ' Users.`%s` LIKE "%%%s" COLLATE utf8_unicode_ci ' + , $like_field + , str_replace(['"', '%'], ['\"', '\%'], $like_value) + ); + } elseif ($this->like_type == self::LIKE_TYPE_EMPTY) { + $sql_like[] = sprintf( + ' (Users.`%s` is NULL OR Users.`%s` = "") ' + , $like_field + , $like_field + ); } else { $sql_like[] = sprintf( ' Users.`%s` LIKE "%s%%" COLLATE utf8_unicode_ci ' diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 32395ef631..002cf97d85 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 @@ -155,9 +155,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 @@ -196,7 +196,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> ausgewählt]]> Controller/Prod/QueryController.php @@ -999,7 +999,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 @@ -1140,7 +1140,7 @@ Apply a template Eine Schablone anwenden - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1174,7 +1174,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? @@ -2377,7 +2377,7 @@ Delete all users rights Alle Nutzerrechte löschen - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -2517,7 +2517,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen admin/fields/templates.html.twig @@ -2765,7 +2765,7 @@ Email '%email%' for login '%login%' already exists in database Email '%email%' für Login '%login%' existiert schon in der Databank - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -3327,7 +3327,7 @@ Vorname / Nachname actions/Feedback/ListsMacros.html.twig web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3966,7 +3966,7 @@ Last applied template letzte angewandte Vorlage - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4196,17 +4196,17 @@ Login %login% already exists in database Benutzername %login% existiert schon im Datenbank - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% Benutzername %login% ist schon in Datei in Linie %line% definiert - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty Benutzername Zeile %line% ist leer - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4228,7 +4228,7 @@ Mail line %line% is empty Email Zeile %line% ist leer - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4676,7 +4676,7 @@ None Keine Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -4938,7 +4938,7 @@ Password is empty at line %line% Passwort ist leer in Zeile %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -6519,7 +6519,7 @@ Supprimer Löschen - web/admin/users.html.twig + web/admin/users.html.twig Supprimer egalement les documents rattaches a ces regroupements @@ -6833,7 +6833,7 @@ This is a template Hier ist eine Schablone - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6853,7 +6853,7 @@ This user has no rights Dieser Benutzer besitzt keine Rechte - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -7045,12 +7045,12 @@ Unable to create template, the name is already used. Unmöglich, eine Vorlage zu erstellen; die Name wird schon benutzt. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Unmöglich, den Benutzer zu erstellen. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -8521,7 +8521,7 @@ admin::compte-utilisateur activite Tätigkeit Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8530,7 +8530,7 @@ admin::compte-utilisateur adresse Adresse Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8545,7 +8545,7 @@ admin::compte-utilisateur code postal PLZ Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8558,25 +8558,25 @@ 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 E-Mail Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.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 @@ -8586,7 +8586,7 @@ admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8594,7 +8594,7 @@ admin::compte-utilisateur id utilisateur Benutzername - 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 @@ -8623,7 +8623,7 @@ Name Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8638,14 +8638,14 @@ admin::compte-utilisateur pays Land - Controller/Admin/UserController.php - web/admin/users.html.twig + Controller/Admin/UserController.php + web/admin/users.html.twig admin::compte-utilisateur poste Beruf Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8656,7 +8656,7 @@ Vorname Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8673,9 +8673,9 @@ admin::compte-utilisateur societe Unternehmen Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.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 @@ -8689,7 +8689,7 @@ admin::compte-utilisateur telephone Telefon - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8705,7 +8705,7 @@ admin::compte-utilisateur ville Ort Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -9107,6 +9107,16 @@ enthält web/admin/users.html.twig + + admin::users:filter: empty + admin::users:filter: empty + web/admin/users.html.twig + + + admin::users:filter: finishing by + admin::users:filter: finishing by + web/admin/users.html.twig + admin::users:filter: start with beginnt mit @@ -9799,7 +9809,7 @@ WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php WorkerManager/Form/WorkerPullAssetsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -9807,12 +9817,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 @@ -9857,7 +9867,7 @@ boutton::exporter Exportieren - web/admin/users.html.twig + web/admin/users.html.twig boutton::fermer @@ -9891,7 +9901,7 @@ Bridge/Flickr/actionelement.html.twig Bridge/Youtube/actionelement.html.twig Bridge/Dailymotion/actionelement.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::monter @@ -11135,12 +11145,12 @@ login::register:email: Vous avez ete accepte sur les collections suivantes : Ihr Zugriff wurde für die folgende Kollektionen genehmigt : - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : Ihr Zugriff wurde für die folgende Kollektionen abgelehnt : - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -11811,7 +11821,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 @@ -14177,7 +14187,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 @@ -14637,7 +14647,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 @@ -15207,7 +15217,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 e37def3754..8b8274b8fc 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 @@ -155,9 +155,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 @@ -196,7 +196,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> selected]]> Controller/Prod/QueryController.php @@ -1000,7 +1000,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 @@ -1141,7 +1141,7 @@ Apply a template Apply a template - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1175,7 +1175,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? @@ -2380,7 +2380,7 @@ Delete all users rights Delete all users rights - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -2520,7 +2520,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings admin/fields/templates.html.twig @@ -2768,7 +2768,7 @@ Email '%email%' for login '%login%' already exists in database E-mail '%email%' for login '%login%' already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -3330,7 +3330,7 @@ First/Last name actions/Feedback/ListsMacros.html.twig web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3969,7 +3969,7 @@ Last applied template Applied user template - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4199,17 +4199,17 @@ Login %login% already exists in database Login %login% already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% Login %login% already exists in the file line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty Login line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4231,7 +4231,7 @@ Mail line %line% is empty E-mail line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4679,7 +4679,7 @@ None None Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -4941,7 +4941,7 @@ Password is empty at line %line% Password is empty in line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -6522,7 +6522,7 @@ Supprimer Delete - web/admin/users.html.twig + web/admin/users.html.twig Supprimer egalement les documents rattaches a ces regroupements @@ -6836,7 +6836,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 @@ -6856,7 +6856,7 @@ This user has no rights This user has no rights - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -7048,12 +7048,12 @@ Unable to create template, the name is already used. Unable to create template, the name is already used. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Unable to create the user. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -8524,7 +8524,7 @@ admin::compte-utilisateur activite Activity Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8533,7 +8533,7 @@ admin::compte-utilisateur adresse Address Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8548,7 +8548,7 @@ admin::compte-utilisateur code postal Zip code Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8561,25 +8561,25 @@ 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 E-mail Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.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 @@ -8589,7 +8589,7 @@ admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8597,7 +8597,7 @@ admin::compte-utilisateur id utilisateur id - 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 @@ -8626,7 +8626,7 @@ Last name Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8641,14 +8641,14 @@ admin::compte-utilisateur pays Country - Controller/Admin/UserController.php - web/admin/users.html.twig + Controller/Admin/UserController.php + web/admin/users.html.twig admin::compte-utilisateur poste Job Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8659,7 +8659,7 @@ First name Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8676,9 +8676,9 @@ admin::compte-utilisateur societe Company Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.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 @@ -8692,7 +8692,7 @@ admin::compte-utilisateur telephone Phone - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8708,7 +8708,7 @@ admin::compte-utilisateur ville City Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -9110,6 +9110,16 @@ contains web/admin/users.html.twig + + admin::users:filter: empty + admin::users:filter: empty + web/admin/users.html.twig + + + admin::users:filter: finishing by + admin::users:filter: finishing by + web/admin/users.html.twig + admin::users:filter: start with starts with @@ -9802,7 +9812,7 @@ WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php WorkerManager/Form/WorkerPullAssetsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -9810,12 +9820,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 @@ -9860,7 +9870,7 @@ boutton::exporter Export - web/admin/users.html.twig + web/admin/users.html.twig boutton::fermer @@ -9894,7 +9904,7 @@ Bridge/Flickr/actionelement.html.twig Bridge/Youtube/actionelement.html.twig Bridge/Dailymotion/actionelement.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::monter @@ -11138,12 +11148,12 @@ login::register:email: Vous avez ete accepte sur les collections suivantes : Your access has been granted on these bases and collections: - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : Your access has been denied to the following databases and collections: - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -11814,7 +11824,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 @@ -14185,7 +14195,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 @@ -14645,7 +14655,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 @@ -15215,7 +15225,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 90d3c06a96..69226d8c4e 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 @@ -155,9 +155,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 @@ -196,7 +196,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> sélectionnés]]> Controller/Prod/QueryController.php @@ -999,7 +999,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 @@ -1140,7 +1140,7 @@ Apply a template Appliquer un modèle - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1174,7 +1174,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? @@ -2377,7 +2377,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 @@ -2517,7 +2517,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action admin/fields/templates.html.twig @@ -2765,7 +2765,7 @@ Email '%email%' for login '%login%' already exists in database L'adresse e-mail '%email%' pour l'identifiant '%login%' existe déjà dans la base - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -3327,7 +3327,7 @@ Prénom / Nom actions/Feedback/ListsMacros.html.twig web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3966,7 +3966,7 @@ Last applied template Dernier modèle appliqué - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4196,17 +4196,17 @@ Login %login% already exists in database L'identifiant %login% existe déjà dans la base de données - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% L'identifiant %login% est déjà mentionné dans le fichier à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty L'identifiant n'est pas renseigné à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4228,7 +4228,7 @@ Mail line %line% is empty L'adresse e-mail n'est pas renseignée à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4676,7 +4676,7 @@ None Aucun Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -4938,7 +4938,7 @@ Password is empty at line %line% Le mot de passe est vide à la ligne %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -6521,7 +6521,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Supprimer Supprimer - web/admin/users.html.twig + web/admin/users.html.twig Supprimer egalement les documents rattaches a ces regroupements @@ -6835,7 +6835,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This is a template Ceci est un modèle - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6855,7 +6855,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This user has no rights Cet utilisateur ne possède aucun droit - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -7047,12 +7047,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Unable to create template, the name is already used. Impossible le créer le modèle, le nom donné est déjà utilisé. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Impossible de créer l'utilisateur. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -8523,7 +8523,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur activite Activité Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8532,7 +8532,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur adresse Adresse Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8547,7 +8547,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur code postal Code postal Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8560,25 +8560,25 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis 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 E-mail Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.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 @@ -8588,7 +8588,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8596,7 +8596,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur id utilisateur Id - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur identifiant @@ -8604,7 +8604,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis 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 @@ -8625,7 +8625,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Nom Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8640,14 +8640,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur pays Pays - Controller/Admin/UserController.php - web/admin/users.html.twig + Controller/Admin/UserController.php + web/admin/users.html.twig admin::compte-utilisateur poste Poste Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8658,7 +8658,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Prénom Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8675,9 +8675,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur societe Société Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.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 @@ -8691,7 +8691,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur telephone Téléphone - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8707,7 +8707,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur ville Ville Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -9110,6 +9110,16 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Contient web/admin/users.html.twig + + admin::users:filter: empty + admin::users:filter: empty + web/admin/users.html.twig + + + admin::users:filter: finishing by + admin::users:filter: finishing by + web/admin/users.html.twig + admin::users:filter: start with Commence par @@ -9802,7 +9812,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php WorkerManager/Form/WorkerPullAssetsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -9810,12 +9820,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 @@ -9860,7 +9870,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::exporter Exporter - web/admin/users.html.twig + web/admin/users.html.twig boutton::fermer @@ -9894,7 +9904,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Bridge/Flickr/actionelement.html.twig Bridge/Youtube/actionelement.html.twig Bridge/Dailymotion/actionelement.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::monter @@ -11138,12 +11148,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le login::register:email: Vous avez ete accepte sur les collections suivantes : Votre accès a été validé pour les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : Votre accès a été refusé pour les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -11814,7 +11824,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 @@ -14188,7 +14198,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 @@ -14648,7 +14658,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 @@ -15218,7 +15228,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 96bbc23ced..b3a30c86a0 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. @@ -155,9 +155,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 @@ -1001,7 +1001,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 @@ -1142,7 +1142,7 @@ Apply a template Pas een sjabloon toe - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -1176,7 +1176,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? @@ -2383,7 +2383,7 @@ Delete all users rights Verwijder alle gebruikersrechten - web/admin/users.html.twig + web/admin/users.html.twig web/admin/editusers.html.twig @@ -2771,7 +2771,7 @@ Email '%email%' for login '%login%' already exists in database Email '%email%' for login '%login%' already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Email Name @@ -3339,7 +3339,7 @@ Voor/Achter naam actions/Feedback/ListsMacros.html.twig web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig Flash @@ -3978,7 +3978,7 @@ Last applied template Laatst gebruikte template - web/admin/users.html.twig + web/admin/users.html.twig Last name is required @@ -4208,17 +4208,17 @@ Login %login% already exists in database Login %login% already exists in database - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login %login% is already defined in the file at line %line% Login %login% is already defined in the file at line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login line %line% is empty Login line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Login to link your account @@ -4240,7 +4240,7 @@ Mail line %line% is empty Mail line %line% is empty - Controller/Admin/UserController.php + Controller/Admin/UserController.php Mail sent @@ -4688,7 +4688,7 @@ None Geen Form/Configuration/EmailFormType.php - web/admin/users.html.twig + web/admin/users.html.twig admin/user/registrations.html.twig @@ -4950,7 +4950,7 @@ Password is empty at line %line% Password is empty at line %line% - Controller/Admin/UserController.php + Controller/Admin/UserController.php Password renewal for login "%login%" has been requested @@ -6531,7 +6531,7 @@ Supprimer Verwijderen - web/admin/users.html.twig + web/admin/users.html.twig Supprimer egalement les documents rattaches a ces regroupements @@ -6845,7 +6845,7 @@ This is a template Dit is een template - web/admin/users.html.twig + web/admin/users.html.twig This link is valid until @@ -6865,7 +6865,7 @@ This user has no rights Deze gebruiker heeft geen rechten - web/admin/users.html.twig + web/admin/users.html.twig This year @@ -7057,12 +7057,12 @@ Unable to create template, the name is already used. Unable to create template, the name is already used. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to create the user. Unable to create the user. - Controller/Admin/UserController.php + Controller/Admin/UserController.php Unable to delete list @@ -8533,7 +8533,7 @@ admin::compte-utilisateur activite Activiteit Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8542,7 +8542,7 @@ admin::compte-utilisateur adresse Adres Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8557,7 +8557,7 @@ admin::compte-utilisateur code postal Postcode Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8570,25 +8570,25 @@ 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 Email Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.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 @@ -8598,7 +8598,7 @@ admin::compte-utilisateur fax Fax Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -8606,7 +8606,7 @@ admin::compte-utilisateur id utilisateur Gebruikersid - web/admin/users.html.twig + web/admin/users.html.twig admin::compte-utilisateur identifiant @@ -8614,7 +8614,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 @@ -8635,7 +8635,7 @@ Naam Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8650,14 +8650,14 @@ admin::compte-utilisateur pays Land - Controller/Admin/UserController.php - web/admin/users.html.twig + Controller/Admin/UserController.php + web/admin/users.html.twig admin::compte-utilisateur poste Postcode Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8668,7 +8668,7 @@ Voornaam Core/Provider/RegistrationServiceProvider.php Event/Subscriber/RegistrationSubscriber.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig admin/user/registrations.html.twig @@ -8685,9 +8685,9 @@ admin::compte-utilisateur societe Bedrijf Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.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 @@ -8701,7 +8701,7 @@ admin::compte-utilisateur telephone Telefoon - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8717,7 +8717,7 @@ admin::compte-utilisateur ville Star Core/Provider/RegistrationServiceProvider.php - Controller/Admin/UserController.php + Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/editusers.html.twig web/account/account.html.twig @@ -9119,6 +9119,16 @@ admin::users:filter: content web/admin/users.html.twig + + admin::users:filter: empty + admin::users:filter: empty + web/admin/users.html.twig + + + admin::users:filter: finishing by + admin::users:filter: finishing by + web/admin/users.html.twig + admin::users:filter: start with admin::users:filter: start with @@ -9811,7 +9821,7 @@ WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php WorkerManager/Form/WorkerPullAssetsType.php - web/admin/users.html.twig + web/admin/users.html.twig boutton::chercher @@ -9819,12 +9829,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 @@ -9869,7 +9879,7 @@ boutton::exporter Exporteren - web/admin/users.html.twig + web/admin/users.html.twig boutton::fermer @@ -9903,7 +9913,7 @@ Bridge/Flickr/actionelement.html.twig Bridge/Youtube/actionelement.html.twig Bridge/Dailymotion/actionelement.html.twig - web/admin/users.html.twig + web/admin/users.html.twig boutton::monter @@ -11147,12 +11157,12 @@ login::register:email: Vous avez ete accepte sur les collections suivantes : login::register:email: Vous avez ete accepte sur les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php login::register:email: Vous avez ete refuse sur les collections suivantes : login::register:email: Vous avez ete refuse sur les collections suivantes : - Controller/Admin/UserController.php + Controller/Admin/UserController.php mai @@ -14188,7 +14198,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 @@ -15218,7 +15228,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 d9ebbe66de..03406cbe68 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 8d2a1872be..60b4529ef9 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 7419646cf1..5d696311e4 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 0bb6b94264..da7d3dd401 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 8bc803f800..2b29c5c011 100644 --- a/templates/web/admin/users.html.twig +++ b/templates/web/admin/users.html.twig @@ -37,7 +37,7 @@ {{ 'admin::userlist: filterguestuser' | trans }} -
+

{{ 'Filter' | trans }} {{ 'Last applied template' | trans }} @@ -63,7 +65,7 @@ - +
@@ -195,6 +197,7 @@ {% endif %} + @@ -247,6 +250,7 @@ {% endif %} +