diff --git a/src/Form/UserProfileFormType.php b/src/Form/UserProfileFormType.php index 4ecae4f28e8512362758ff156e2f5e881c2ff843..0180676c866a04eaff95c5ab7e35e6d262592fda 100644 --- a/src/Form/UserProfileFormType.php +++ b/src/Form/UserProfileFormType.php @@ -45,14 +45,14 @@ class UserProfileFormType extends AbstractType 'mapped' => false, // This field is not mapped to any property 'data' => $options['userLocale'], // Set the initial locale from the user's data ]) - ->add('activePersonalStats', CheckboxType::class, [ - 'required' => false, - 'label' => 'user_profile.active_personal_stats', - ]) ->add('activeGamification', CheckboxType::class, [ 'required' => false, 'label' => 'user_profile.active_gamification', ]) + ->add('activePersonalStats', CheckboxType::class, [ + 'required' => false, + 'label' => 'user_profile.active_personal_stats', + ]) ->add('shareDataWithOtherUsers', CheckboxType::class, [ 'required' => false, 'label' => 'user_profile.share_data_with_other_users', diff --git a/templates/base.html.twig b/templates/base.html.twig index a014398aa5dd34a980a72727f30812cb466df5f8..b7cd2dce4e2f352b220c7f7a1be993ab9eba02ae 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -9,7 +9,7 @@ {% block stylesheets %} <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> {{ encore_entry_link_tags('app') }} - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"> + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css"> <link rel="stylesheet" href="{{ asset('assets/css/font-awesome.min.css') }}"> <link rel="stylesheet" href="{{ asset('assets/css/app.css') }}"> @@ -17,7 +17,7 @@ {% endblock %} {% block javascripts %} {{ encore_entry_script_tags('app') }} - <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-u1OknCvxWvY5kfmNBILK2hRnQC3Pr17a+RTT6rIHI7NnikvbZlHgTPOOmMi466C8" crossorigin="anonymous"></script> + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-u1OknCvxWvY5kfmNBILK2hRnQC3Pr17a+RTT6rIHI7NnikvbZlHgTPOOmMi466C8" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.7.0.min.js" integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> diff --git a/translations/messages+intl-icu.fr.yaml b/translations/messages+intl-icu.fr.yaml index 664f15d76609d5bc19506cddc32601aecc2daf0a..4535b244febbb00d78e87499573b5be666e0f607 100644 --- a/translations/messages+intl-icu.fr.yaml +++ b/translations/messages+intl-icu.fr.yaml @@ -23,8 +23,8 @@ Comments: Commentaire user_profile.email: Email user_profile.native_language: 'Langue native' user_profile.app_language: 'Langue interface' -user_profile.active_personal_stats: 'Partage de statistiques personnelles' -user_profile.active_gamification: 'Activer Gamification' +user_profile.active_personal_stats: 'Activer les statistiques personnelles' +user_profile.active_gamification: 'Activer la gamification' user_profile.share_data_with_other_users: 'Partager les données avec d''autres utilisateurs' user_profile.share_data_with_researchers: 'Partager les données avec les chercheur' user_profile.profile_picture: 'Photo de profil'