Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ecolyo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
LLLE_Project
Ecolyo
Commits
bc6a64cd
Commit
bc6a64cd
authored
5 months ago
by
Bastien DUMONT
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/force-fr-lang' into 'dev'
fix(ui): adjust lang to browser See merge request
!1258
parents
2feba43d
52b0a4f9
No related branches found
No related tags found
1 merge request
!1258
fix(ui): adjust lang to browser
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Charts/AxisBottom.tsx
+7
-22
7 additions, 22 deletions
src/components/Charts/AxisBottom.tsx
src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap
+4
-4
4 additions, 4 deletions
src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap
with
11 additions
and
26 deletions
src/components/Charts/AxisBottom.tsx
+
7
−
22
View file @
bc6a64cd
...
...
@@ -39,9 +39,7 @@ function TextAxis({
return
(
<
text
y
=
"10"
dy
=
"0.71em"
transform
=
{
`translate(
${
width
}
)`
}
>
<
tspan
className
=
{
style
}
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
year
:
'
numeric
'
})
}
{
dataload
.
date
.
toLocaleString
({
year
:
'
numeric
'
})
}
</
tspan
>
</
text
>
)
...
...
@@ -49,9 +47,7 @@ function TextAxis({
return
(
<
text
y
=
"10"
dy
=
"0.71em"
transform
=
{
`translate(
${
width
}
)`
}
>
<
tspan
className
=
{
style
}
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
month
:
'
narrow
'
})
}
{
dataload
.
date
.
toLocaleString
({
month
:
'
narrow
'
})
}
</
tspan
>
</
text
>
)
...
...
@@ -61,14 +57,10 @@ function TextAxis({
return
(
<>
<
tspan
className
=
{
style
}
x
=
"0"
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
weekday
:
'
narrow
'
})
}
{
dataload
.
date
.
toLocaleString
({
weekday
:
'
narrow
'
})
}
</
tspan
>
<
tspan
className
=
{
style
}
x
=
"0"
dy
=
"1.2em"
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
day
:
'
numeric
'
})
}
{
dataload
.
date
.
toLocaleString
({
day
:
'
numeric
'
})
}
</
tspan
>
</>
)
...
...
@@ -78,15 +70,12 @@ function TextAxis({
<
tspan
className
=
{
style
}
x
=
"0"
textAnchor
=
"middle"
>
{
capitalize
(
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
weekday
:
'
short
'
})
.
substring
(
0
,
3
)
)
}
</
tspan
>
<
tspan
className
=
{
style
}
x
=
"0"
dy
=
"1.2em"
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
day
:
'
numeric
'
})
}
{
dataload
.
date
.
toLocaleString
({
day
:
'
numeric
'
})
}
</
tspan
>
</>
)
...
...
@@ -104,14 +93,10 @@ function TextAxis({
return
(
<
text
y
=
"10"
dy
=
"0.71em"
transform
=
{
`translate(
${
width
}
)`
}
>
<
tspan
className
=
{
style
}
x
=
"0"
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
weekday
:
'
narrow
'
})
}
{
dataload
.
date
.
toLocaleString
({
weekday
:
'
narrow
'
})
}
</
tspan
>
<
tspan
className
=
{
style
}
x
=
"0"
dy
=
"1.2em"
textAnchor
=
"middle"
>
{
dataload
.
date
.
setLocale
(
'
fr-FR
'
)
.
toLocaleString
({
day
:
'
numeric
'
})
}
{
dataload
.
date
.
toLocaleString
({
day
:
'
numeric
'
})
}
</
tspan
>
</
text
>
)
...
...
This diff is collapsed.
Click to expand it.
src/components/Charts/__snapshots__/AxisBottom.spec.tsx.snap
+
4
−
4
View file @
bc6a64cd
...
...
@@ -22,7 +22,7 @@ exports[`AxisBottom component test should correctly render DAY format of AxisBot
text-anchor="middle"
x="0"
>
J
T
</tspan>
<tspan
class="tick-text tick-text-selected chart-ticks-x-text"
...
...
@@ -49,7 +49,7 @@ exports[`AxisBottom component test should correctly render DAY format of AxisBot
text-anchor="middle"
x="0"
>
V
F
</tspan>
<tspan
class="tick-text chart-ticks-x-text"
...
...
@@ -266,7 +266,7 @@ exports[`AxisBottom component test should correctly render WEEK format of AxisBo
text-anchor="middle"
x="0"
>
J
T
</tspan>
<tspan
class="tick-text tick-text-selected chart-ticks-x-text"
...
...
@@ -293,7 +293,7 @@ exports[`AxisBottom component test should correctly render WEEK format of AxisBo
text-anchor="middle"
x="0"
>
V
F
</tspan>
<tspan
class="tick-text chart-ticks-x-text"
...
...
This diff is collapsed.
Click to expand it.
build-token
@group_1518_bot_2801ee8bae68451533dcea1179b03710
mentioned in commit
81f33616
·
5 months ago
mentioned in commit
81f33616
mentioned in commit 81f3361606def9f3433fe4961d78a22a2f7d994c
Toggle commit list
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