diff --git a/src/Form/AdminPages/CurrencyAdminForm.php b/src/Form/AdminPages/CurrencyAdminForm.php index 882446fe..9347768c 100644 --- a/src/Form/AdminPages/CurrencyAdminForm.php +++ b/src/Form/AdminPages/CurrencyAdminForm.php @@ -59,6 +59,7 @@ class CurrencyAdminForm extends BaseEntityAdminForm 'preferred_choices' => ['EUR', 'USD', 'GBP', 'JPY', 'CNY'], 'attr' => [ 'class' => 'selectpicker', + 'title' => 'selectpicker.nothing_selected', 'data-live-search' => true, ], 'disabled' => ! $this->security->isGranted($is_new ? 'create' : 'edit', $entity), diff --git a/src/Form/AdminPages/GroupAdminForm.php b/src/Form/AdminPages/GroupAdminForm.php index 7baae081..6a20c144 100644 --- a/src/Form/AdminPages/GroupAdminForm.php +++ b/src/Form/AdminPages/GroupAdminForm.php @@ -56,7 +56,7 @@ class GroupAdminForm extends BaseEntityAdminForm $builder->add('enforce2FA', CheckboxType::class, [ 'required' => false, 'label' => 'group.edit.enforce_2fa', - 'help' => 'entity.edit.enforce_2fa.help', + 'help' => 'group.edit.enforce_2fa.help', 'label_attr' => [ 'class' => 'checkbox-custom', ], diff --git a/src/Form/LabelOptionsType.php b/src/Form/LabelOptionsType.php index e2152298..4f0af242 100644 --- a/src/Form/LabelOptionsType.php +++ b/src/Form/LabelOptionsType.php @@ -95,6 +95,7 @@ class LabelOptionsType extends AbstractType }, 'attr' => [ 'class' => 'selectpicker', + 'title' => 'selectpicker.nothing_selected', 'data-live-search' => true, ], ]); diff --git a/src/Form/Part/PartLotType.php b/src/Form/Part/PartLotType.php index 78461f0b..119defee 100644 --- a/src/Form/Part/PartLotType.php +++ b/src/Form/Part/PartLotType.php @@ -82,6 +82,7 @@ class PartLotType extends AbstractType 'disable_not_selectable' => true, 'attr' => [ 'class' => 'selectpicker form-control-sm', + 'title' => 'selectpicker.nothing_selected', 'data-live-search' => true, ], ]); diff --git a/src/Form/Type/MasterPictureAttachmentType.php b/src/Form/Type/MasterPictureAttachmentType.php index 69268807..4e0570d8 100644 --- a/src/Form/Type/MasterPictureAttachmentType.php +++ b/src/Form/Type/MasterPictureAttachmentType.php @@ -63,6 +63,7 @@ class MasterPictureAttachmentType extends AbstractType 'choice_translation_domain' => false, 'attr' => [ 'class' => 'selectpicker', + 'title' => 'selectpicker.nothing_selected', ], 'choice_attr' => function (Options $options) { return function ($choice, $key, $value) use ($options) { diff --git a/src/Form/Type/StructuralEntityType.php b/src/Form/Type/StructuralEntityType.php index bee6742c..fef67c7e 100644 --- a/src/Form/Type/StructuralEntityType.php +++ b/src/Form/Type/StructuralEntityType.php @@ -121,6 +121,7 @@ class StructuralEntityType extends AbstractType $tmp = [ 'class' => 'selectpicker', 'data-live-search' => true, + 'title' => 'selectpicker.nothing_selected', ]; if ($options['empty_message']) { $tmp['data-none-Selected-Text'] = $options['empty_message']; diff --git a/src/Form/UserAdminForm.php b/src/Form/UserAdminForm.php index 9958efb4..57997bc3 100644 --- a/src/Form/UserAdminForm.php +++ b/src/Form/UserAdminForm.php @@ -151,6 +151,7 @@ class UserAdminForm extends AbstractType 'required' => false, 'attr' => [ 'class' => 'selectpicker', + 'title' => 'selectpicker.nothing_selected', 'data-live-search' => true, ], 'placeholder' => 'user_settings.language.placeholder', @@ -162,6 +163,7 @@ class UserAdminForm extends AbstractType 'required' => false, 'attr' => [ 'class' => 'selectpicker', + 'title' => 'selectpicker.nothing_selected', 'data-live-search' => true, ], 'placeholder' => 'user_settings.timezone.placeholder', @@ -177,6 +179,7 @@ class UserAdminForm extends AbstractType }, 'attr' => [ 'class' => 'selectpicker', + 'title' => 'selectpicker.nothing_selected', ], 'choice_translation_domain' => false, 'placeholder' => 'user_settings.theme.placeholder', diff --git a/src/Form/UserSettingsType.php b/src/Form/UserSettingsType.php index a92303ca..f9d89fd9 100644 --- a/src/Form/UserSettingsType.php +++ b/src/Form/UserSettingsType.php @@ -122,7 +122,7 @@ class UserSettingsType extends AbstractType 'attr' => [ 'class' => 'selectpicker', ], - 'translation_domain' => false, + 'choice_translation_domain' => false, 'choices' => User::AVAILABLE_THEMES, 'choice_label' => function ($entity, $key, $value) { return $value; diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf index 073619ad..4df0062a 100644 --- a/translations/messages.de.xlf +++ b/translations/messages.de.xlf @@ -17,7 +17,7 @@ Part-DB1\templates\AdminPages\AttachmentTypeAdmin.html.twig:12 new - + attachment_type.edit Bearbeite Dateityp @@ -27,7 +27,7 @@ Part-DB1\templates\AdminPages\AttachmentTypeAdmin.html.twig:16 new - + attachment_type.new Neuer Dateityp @@ -82,7 +82,7 @@ Part-DB1\templates\AdminPages\CategoryAdmin.html.twig:13 new - + category.edit Bearbeite Kategorie @@ -92,7 +92,7 @@ Part-DB1\templates\AdminPages\CategoryAdmin.html.twig:17 new - + category.new Neue Kategorie @@ -132,7 +132,7 @@ Part-DB1\templates\AdminPages\CurrencyAdmin.html.twig:29 new - + currency.edit Bearbeite Währung @@ -142,7 +142,7 @@ Part-DB1\templates\AdminPages\CurrencyAdmin.html.twig:33 new - + currency.new Neue Währung @@ -163,7 +163,7 @@ Part-DB1\templates\AdminPages\DeviceAdmin.html.twig:8 new - + device.edit Bearbeite Baugruppe @@ -173,7 +173,7 @@ Part-DB1\templates\AdminPages\DeviceAdmin.html.twig:12 new - + device.new Neue Baugruppe @@ -403,7 +403,7 @@ Part-DB1\templates\AdminPages\FootprintAdmin.html.twig:13 new - + footprint.edit Bearbeite Footprint @@ -413,7 +413,7 @@ Part-DB1\templates\AdminPages\FootprintAdmin.html.twig:17 new - + footprint.new Neuer Footprint @@ -445,7 +445,7 @@ Part-DB1\templates\AdminPages\GroupAdmin.html.twig:24 new - + group.edit Bearbeite Gruppe @@ -455,7 +455,7 @@ Part-DB1\templates\AdminPages\GroupAdmin.html.twig:28 new - + group.new Neue Gruppe @@ -492,7 +492,7 @@ Part-DB1\templates\AdminPages\LabelProfileAdmin.html.twig:55 new - + label_profile.edit Bearbeite Labelprofil @@ -502,7 +502,7 @@ Part-DB1\templates\AdminPages\LabelProfileAdmin.html.twig:59 new - + label_profile.new Neues Labelprofil @@ -523,7 +523,7 @@ Part-DB1\templates\AdminPages\ManufacturerAdmin.html.twig:8 new - + manufacturer.edit Bearbeite Hersteller @@ -533,7 +533,7 @@ Part-DB1\templates\AdminPages\ManufacturerAdmin.html.twig:12 new - + manufacturer.new Neuer Hersteller @@ -568,7 +568,7 @@ Part-DB1\templates\AdminPages\StorelocationAdmin.html.twig:32 new - + storelocation.edit Bearbeite Lagerort @@ -578,7 +578,7 @@ Part-DB1\templates\AdminPages\StorelocationAdmin.html.twig:36 new - + storelocation.new Neuer Lagerort @@ -599,7 +599,7 @@ Part-DB1\templates\AdminPages\SupplierAdmin.html.twig:16 new - + supplier.edit Bearbeite Lieferant @@ -609,7 +609,7 @@ Part-DB1\templates\AdminPages\SupplierAdmin.html.twig:20 new - + supplier.new Neuer Lieferant @@ -751,7 +751,7 @@ Der Benutzer wird alle Zwei-Faktor-Authentifizierungmethoden neu einrichten müs Part-DB1\templates\AdminPages\UserAdmin.html.twig:85 new - + user.edit Bearbeite Benutzer @@ -761,7 +761,7 @@ Der Benutzer wird alle Zwei-Faktor-Authentifizierungmethoden neu einrichten müs Part-DB1\templates\AdminPages\UserAdmin.html.twig:89 new - + user.new Neuer Benutzer @@ -6455,7 +6455,7 @@ Wenn Sie dies fehlerhafterweise gemacht haben oder ein Computer nicht mehr vertr - + @@ -9044,5 +9044,29 @@ Element 3 Twig Modus benutzen + + + label_profile.showInDropdown + In Barcode Schnellauswahl anzeigen + + + + + group.edit.enforce_2fa + Erzwinge Zwei-Faktor-Authentifizierung (2FA) + + + + + group.edit.enforce_2fa.help + Wenn diese Option aktiv ist, muss jedes direkte Mitglied dieser Gruppe, mindests einen zweiten Faktor zur Authentifizierung einrichten. Empfohlen z.B. für administrative Gruppen mit weitreichenden Berechtigungen. + + + + + selectpicker.nothing_selected + Nichts ausgewählt + + diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index d1da48fc..ae2ff731 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -17,7 +17,7 @@ Part-DB1\templates\AdminPages\AttachmentTypeAdmin.html.twig:12 new - + attachment_type.edit Edit file type @@ -27,7 +27,7 @@ Part-DB1\templates\AdminPages\AttachmentTypeAdmin.html.twig:16 new - + attachment_type.new New file type @@ -82,7 +82,7 @@ Part-DB1\templates\AdminPages\CategoryAdmin.html.twig:13 new - + category.edit Edit category @@ -92,7 +92,7 @@ Part-DB1\templates\AdminPages\CategoryAdmin.html.twig:17 new - + category.new New category @@ -132,7 +132,7 @@ Part-DB1\templates\AdminPages\CurrencyAdmin.html.twig:29 new - + currency.edit Edit currency @@ -142,7 +142,7 @@ Part-DB1\templates\AdminPages\CurrencyAdmin.html.twig:33 new - + currency.new New currency @@ -163,7 +163,7 @@ Part-DB1\templates\AdminPages\DeviceAdmin.html.twig:8 new - + device.edit Edit device @@ -173,7 +173,7 @@ Part-DB1\templates\AdminPages\DeviceAdmin.html.twig:12 new - + device.new New device @@ -403,7 +403,7 @@ Part-DB1\templates\AdminPages\FootprintAdmin.html.twig:13 new - + footprint.edit Edit footprint @@ -413,7 +413,7 @@ Part-DB1\templates\AdminPages\FootprintAdmin.html.twig:17 new - + footprint.new New footprint @@ -445,7 +445,7 @@ Part-DB1\templates\AdminPages\GroupAdmin.html.twig:24 new - + group.edit Edit group @@ -455,7 +455,7 @@ Part-DB1\templates\AdminPages\GroupAdmin.html.twig:28 new - + group.new New group @@ -492,7 +492,7 @@ Part-DB1\templates\AdminPages\LabelProfileAdmin.html.twig:55 new - + label_profile.edit Edit label profile @@ -502,7 +502,7 @@ Part-DB1\templates\AdminPages\LabelProfileAdmin.html.twig:59 new - + label_profile.new New label profile @@ -523,7 +523,7 @@ Part-DB1\templates\AdminPages\ManufacturerAdmin.html.twig:8 new - + manufacturer.edit Edit manufacturer @@ -533,7 +533,7 @@ Part-DB1\templates\AdminPages\ManufacturerAdmin.html.twig:12 new - + manufacturer.new New manufacturer @@ -568,7 +568,7 @@ Part-DB1\templates\AdminPages\StorelocationAdmin.html.twig:32 new - + storelocation.edit Edit store location @@ -578,7 +578,7 @@ Part-DB1\templates\AdminPages\StorelocationAdmin.html.twig:36 new - + storelocation.new New store location @@ -599,7 +599,7 @@ Part-DB1\templates\AdminPages\SupplierAdmin.html.twig:16 new - + supplier.edit Edit supplier @@ -609,7 +609,7 @@ Part-DB1\templates\AdminPages\SupplierAdmin.html.twig:20 new - + supplier.new New supplier @@ -752,7 +752,7 @@ The user will have to set up all two-factor authentication methods again and pri Part-DB1\templates\AdminPages\UserAdmin.html.twig:85 new - + user.edit Edit user @@ -762,7 +762,7 @@ The user will have to set up all two-factor authentication methods again and pri Part-DB1\templates\AdminPages\UserAdmin.html.twig:89 new - + user.new New user @@ -6456,7 +6456,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can - + @@ -9045,5 +9045,35 @@ Element 3 Use twig mode + + + label_profile.showInDropdown + Show in quick select + + + + + group.edit.enforce_2fa + Enforce Two-factor authentication (2FA) + + + + + group.edit.enforce_2fa.help + If this option is enabled, every direct member of this group, has to configure at least one second-factor for authentication. Recommended for administrative groups with much permissions. + + + + + selectpicker.empty + selectpicker.empty + + + + + selectpicker.nothing_selected + Nothing selected + +