Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Base lexicale BaLex
Manage
Activity
Members
Labels
Plan
Issues
18
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lex gaMe
Base lexicale BaLex
Commits
794b9544
Commit
794b9544
authored
7 months ago
by
pfleu
Browse files
Options
Downloads
Patches
Plain Diff
Update bootstrap. Fix messages.
parent
0f2281d7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Form/UserProfileFormType.php
+4
-4
4 additions, 4 deletions
src/Form/UserProfileFormType.php
templates/base.html.twig
+2
-2
2 additions, 2 deletions
templates/base.html.twig
translations/messages+intl-icu.fr.yaml
+2
-2
2 additions, 2 deletions
translations/messages+intl-icu.fr.yaml
with
8 additions
and
8 deletions
src/Form/UserProfileFormType.php
+
4
−
4
View file @
794b9544
...
...
@@ -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'
,
...
...
This diff is collapsed.
Click to expand it.
templates/base.html.twig
+
2
−
2
View file @
794b9544
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
translations/messages+intl-icu.fr.yaml
+
2
−
2
View file @
794b9544
...
...
@@ -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
G
amification'
user_profile.active_personal_stats
:
'
Activer
les
statistiques
personnelles'
user_profile.active_gamification
:
'
Activer
la
g
amification'
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'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment