Merge remote-tracking branch 'origin/1.2' into 1.x

pimcore · Nov 17, 2023 · bc5649f · bc5649f
2 parents 3c7f80d + d9564cd
commit bc5649f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 36 deletions.
diff --git a/public/js/pimcore/element/permissionchecker.js b/public/js/pimcore/element/permissionchecker.js
@@ -254,7 +254,7 @@ pimcore.element.permissionchecker = Class.create({
         this.resultPanel.removeAll();
 
         var columns = [
-            {text: t("Username"), sortable: false, dataIndex: "userName", editable: false, flex: 150, filter: 'string'}
+            {text: t("username"), sortable: false, dataIndex: "userName", editable: false, flex: 150, filter: 'string'}
         ];
 
         var columnCount = data.columns.length;

diff --git a/src/Security/PimcoreUserTwoFactorCondition.php b/src/Security/PimcoreUserTwoFactorCondition.php
@@ -27,8 +27,9 @@ class PimcoreUserTwoFactorCondition implements TwoFactorConditionInterface
 {
     public function shouldPerformTwoFactorAuthentication(AuthenticationContextInterface $context): bool
     {
+        //return true for performing two factor for firewalls other than admin
         if ($context->getFirewallName() !== 'pimcore_admin') {
-            return false;
+            return true;
         }
 
         $user = $context->getUser();

diff --git a/translations/admin.en.yaml b/translations/admin.en.yaml
@@ -970,6 +970,7 @@ email_log_subject: Subject
 gdpr_data_extractor_label_email: 'Email Address'
 workflow_notes: Notes
 2fa_code: Code
+username: Username
 password: Password
 show_metainfo: Info
 email_log_from: From

diff --git a/translations/admin.es.yaml b/translations/admin.es.yaml
@@ -1044,37 +1044,37 @@ content_main_document: Documento de Contenido principal
 2fa_wrong: "\xA1C\xF3digo incorrecto!"
 language_main: Principal
 system_appearance_settings: Apariencia y Marca
-male: Male
-female: Female
-preview_generator_locale: Language
-preview_generator_site: Site
-failed_to_create_new_item_select_options: Failed to create new item. Name must be
-  UpperCamelCase format, at least 3 characters long and may not contain any reserved
-  words.
-pdf_js_unsafe: This PDF file contains JavaScript. If you want to view it, please download
-  and open it in your local PDF viewer.
-pdf_scan_in_progress: 'Preview not available: PDF is being scanned. This may take
-  a while.'
-keybinding_save: Save
-keybinding_publish: Publish
-keybinding_unpublish: Unpublish
-keybinding_rename: Rename
-keybinding_refresh: Reload
-keybinding_openDocument: Open Document
-keybinding_openAsset: Open Asset
-keybinding_openObject: Open Object
-keybinding_openInTree: Show in Tree
-keybinding_searchDocument: Search Documents
-keybinding_searchAsset: Search Assets
-keybinding_searchObject: Search Objects
-keybinding_showElementHistory: Recently Opened Elements
-keybinding_closeAllTabs: Close all tabs
-keybinding_searchAndReplaceAssignments: Search & Replace Assignments
-keybinding_redirects: Redirects
-keybinding_sharedTranslations: Shared Translations
-keybinding_recycleBin: Recycle Bin
-keybinding_notesEvents: Notes &amp; Events
-keybinding_tagConfiguration: Tag Configuration
-keybinding_users: Users
+male: Masculino
+female: Femenino
+preview_generator_locale: Idioma
+preview_generator_site: Web
+failed_to_create_new_item_select_options: Error al crear un nuevo elemento. El nombre
+  debe estar en formato UpperCamelCase, tener al menos 3 caracteres y no puede contener
+  palabras reservadas.
+pdf_js_unsafe: "Este archivo PDF contiene JavaScript. Si quieres verlo, desc\xE1rgalo
+  y \xE1brelo en tu visor de PDF local."
+pdf_scan_in_progress: "Vista previa no disponible: Se est\xE1 escaneando el PDF. Puede
+  tardar un poco."
+keybinding_save: Guardar
+keybinding_publish: Publicar
+keybinding_unpublish: Despublicar
+keybinding_rename: Renombrar
+keybinding_refresh: Recargar
+keybinding_openDocument: Abrir documento
+keybinding_openAsset: Abrir recurso
+keybinding_openObject: Abrir objeto
+keybinding_openInTree: "Mostrar en \xE1rbol"
+keybinding_searchDocument: Buscar documentos
+keybinding_searchAsset: Buscar recursos
+keybinding_searchObject: Buscar objetos
+keybinding_showElementHistory: Elementos abiertos recientemente
+keybinding_closeAllTabs: "Cerrar todas las pesta\xF1as"
+keybinding_searchAndReplaceAssignments: Buscar y reemplazar asignaciones
+keybinding_redirects: Redirecciones
+keybinding_sharedTranslations: Traducciones compartidas
+keybinding_recycleBin: Papelera de reciclaje
+keybinding_notesEvents: Notas y Eventos
+keybinding_tagConfiguration: "Configuraci\xF3n de etiquetas"
+keybinding_users: Usuarios
 keybinding_roles: Roles
 ...
diff --git a/translations/admin.fr.yaml b/translations/admin.fr.yaml
@@ -367,7 +367,7 @@ edit_current_page: Editer cette page
 close: Fermer
 name_already_in_use: "Le nom est d\xE9j\xE0 utilis\xE9"
 name_and_key_must_be_defined: "Le nom et le type doivent \xEAtre d\xE9finis"
-mandatory_field_empty: Veuillez remplire tous les champs requis
+mandatory_field_empty: Veuillez remplir tous les champs requis
 reload: Recharger
 schedule: Calendrier
 time: Temps

diff --git a/translations/admin_ext.en.yaml b/translations/admin_ext.en.yaml
@@ -689,7 +689,6 @@ quantityValueRange_field: Quantity Value Range
 numeric: Number
 structuredtable_type_number: Number
 objectsMetadata_type_number: Number
-username: Username
 localized_fields: Localized Fields
 field_collections: Field-Collections
 special_settings_tooltip: Special Settings